[python-arrayfire] 05/58: Merge branch 'master' into devel

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-arrayfire.

commit 363fbd1fbdcf5542c6d4bf638c79643a049c73e7
Merge: ca848fa f5efab4
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Mar 28 17:31:23 2016 -0400

    Merge branch 'master' into devel

 CHANGELOG.md | 3 +++
 setup.py     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc setup.py
index e362898,6c9d933..634c341
--- a/setup.py
+++ b/setup.py
@@@ -16,8 -16,8 +16,8 @@@ from setuptools import setup, find_pack
  ## 2) Include test suite
  
  # Some hackery to avoid merge conflicts between master and devel
- current_version = "3.3.20160320"
+ current_version = "3.3.20160328"
 -devel_version = "3.3.0"
 +devel_version = "3.4.0"
  release_version = current_version if current_version > devel_version else devel_version
  
  setup(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-arrayfire.git