Merge branch 'new-versioning-scheme' into branch-1.13.2
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Feb 2013 21:13:34 +0000 (22:13 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 20 Feb 2013 21:13:34 +0000 (22:13 +0100)
* new-versioning-scheme:
  maint: describe new versioning and branching scheme, and adjust to it


Trivial merge