Merge branch 'maint'
commit02985d0886e7fc471418e00d97e4fdd4a60e6ae7
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 28 Aug 2012 11:30:41 +0000 (28 13:30 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 28 Aug 2012 11:30:41 +0000 (28 13:30 +0200)
tree6744c79f073b7e37c43fec11b6f8fae13c0e6a54
parent9b8b72c2699ae2dd74d80322a402d7251290bc55
parentd58d40f0c864ae3a6d7c66df34769619ad2486c1
Merge branch 'maint'