Merge branch 'new-versioning-scheme' into branch-1.13.2
commitb7ac9a37b3c7c78db1ba2beb32cf10bda9db996b
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Feb 2013 21:13:34 +0000 (20 22:13 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Feb 2013 21:13:34 +0000 (20 22:13 +0100)
tree6570e01aa0b6e11d7b5ce1277a14aa9491b8a260
parent8234bfb0c0fa62b2c43b9c8f0a5ab5fc5316ff4c
parent97aaf121e92767dc06385d020dd30cdfaa86126f
Merge branch 'new-versioning-scheme' into branch-1.13.2

* new-versioning-scheme:
  maint: describe new versioning and branching scheme, and adjust to it