Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 17 Jan 2012 13:20:40 +0000 (14:20 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 17 Jan 2012 13:20:40 +0000 (14:20 +0100)
* maint:
  contrib: new, a directory for non-mainstream functionalities


Trivial merge