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)
commit8d51cdc0d813f09177e07476b45285b8589efe00
treed68a93e0dcc6b4f5326897f27c6c788dc03cf8ce
parentbb9e2e6271adc481fc2b522ed06dd52f18e0ed45
parente29c49181fb4ffa2506ca690964b5e9e07c8fb49
Merge branch 'maint'

* maint:
  contrib: new, a directory for non-mainstream functionalities