Merge branch 'master' of https://github.com/nanocreaator/nepi origin/HEAD origin/master nepi-3.2.4-pypi
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 8 Jun 2015 13:53:59 +0000 (15:53 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 8 Jun 2015 13:53:59 +0000 (15:53 +0200)
# By Mario Zancanaro
# Via Mario Zancanaro
* 'master' of https://github.com/nanocreaator/nepi:
  New version 3.2.4


Trivial merge