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)
commit85677e02eff12f0fc42c3e27abc8638a3418f18a
tree932ea0eb0dd6725105bef74e93c9a7152b6442d2
parent0dc8072b36be6578676917e3d6523e9018d497a2
parent3d8a0cf8ca439e238d6e3fd688e834ab0d941d8a
Merge branch 'master' of https://github.com/nanocreaator/nepi

# By Mario Zancanaro
# Via Mario Zancanaro
* 'master' of https://github.com/nanocreaator/nepi:
  New version 3.2.4