[pynfft] 05/07: Merge tag 'upstream/1.2.1'

[Ghislain Vaillant]

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

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

commit 5d07cdb5d5a75eb21782c672b3beae130457aea9
Merge: d36d432 9770281
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Thu Feb 13 20:50:25 2014 +0000

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 PKG-INFO                    | 2 +-
 doc/source/conf.py          | 2 +-
 pyNFFT.egg-info/PKG-INFO    | 2 +-
 pyNFFT.egg-info/SOURCES.txt | 4 ++--
 pynfft/__init__.py          | 1 -
 setup.py                    | 2 +-
 tests/test_nfft.py          | 3 +--
 7 files changed, 7 insertions(+), 9 deletions(-)

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