Merge branch 'maint'
commit847d2b434a652bcabe786cee20c4d1b717d7cc28
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 24 Feb 2012 08:45:21 +0000 (24 09:45 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 24 Feb 2012 08:45:21 +0000 (24 09:45 +0100)
tree797921a3bdd0711f907042a6041cabd79f45fce1
parenta356059f387688bacc73c757e3d86bc701303420
parent9ae171a86e8a397ed0b71f0cc7f916eb1d150835
Merge branch 'maint'