diff options
author | mguetlein <martin.guetlein@gmail.com> | 2010-08-11 08:48:02 +0200 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2010-08-11 08:48:02 +0200 |
commit | 26369d68b9edcf053789e2d024e0286fd517a29d (patch) | |
tree | 1da11b9beef0df56a291f836e6a6cf46bfacaa01 /VERSION | |
parent | 2806bfff8a01f75351f31c5bd676b25b2fb36017 (diff) | |
parent | 44d05cec5a612f50f8a61ccd762c8176a0b8fd68 (diff) |
Merge remote branch 'helma/master' into test
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.5.7 +1.6.2 |