[pyviennacl] 03/05: Merge tag 'upstream/1.0.3+dfsg' into debian

[Toby St Clere Smithe]

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

tsmithe-guest pushed a commit to branch debian
in repository pyviennacl.

commit 2fb354ba991c05142b5789e59456e757f4dc47bb
Merge: 86082c4 433b427
Author: Toby Smithe <git at tsmithe.net>
Date:   Sat May 17 18:23:22 2014 +0100

    Merge tag 'upstream/1.0.3+dfsg' into debian
    
    Upstream version 1.0.3+dfsg
    
    Conflicts:
    	pyviennacl.egg-info/PKG-INFO

 ChangeLog                                | 29 +++++++++++++++++++++++++++++
 PKG-INFO                                 |  8 ++++----
 README.rst                               |  6 +++---
 doc/build-doc.py                         |  2 +-
 PKG-INFO => pyviennacl.egg-info/PKG-INFO |  8 ++++----
 pyviennacl/__init__.py                   | 18 ++++++++++--------
 pyviennacl/pycore.py                     | 18 ++++++++++++++----
 pyviennacl/version.py                    |  2 +-
 src/_viennacl/core.cpp                   |  2 +-
 tests/matrix_operations.py               | 24 +++++++++++++++++-------
 10 files changed, 84 insertions(+), 33 deletions(-)

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