Merge branch 'v2.2' into v2.3

531ee25a · Giovanni Bussi · f03c0bf2 · ad19f4da · 531ee25a
Commit 531ee25a authored 8 years ago by Giovanni Bussi
--- a/CHANGES/v2.2.txt
+++ b/CHANGES/v2.2.txt
@@ -182,7 +182,7 @@ For users:
 For developers:
 - Macports portile is now tested on travis at every plumed push.

-Version 2.2.5
+Version 2.2.5 (coming soon)
 -------------
 See branch \branch{v2.2} on git repository.