diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:24 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:24 +0200 |
commit | 9e86e33da6658c4c16a3ae1bfdbaf594fda31e1b (patch) | |
tree | 3ef255185a2f103184583adaaca589a76d0aac14 /version | |
parent | e827043ef36b092968b247dac7a66d947be328f9 (diff) | |
parent | 28920335fe1b5b7758917c0ed7a6f72e6614c376 (diff) |
Merge branch 'master' into bulkbulk
Diffstat (limited to 'version')
-rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -2.4.0.a3 +2.4.0.a4 |