Merge branch 'maint'
commit5aaf45ea6d5e2e5d3fd9c07fcb6e1b27d6178f03
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Oct 2013 23:34:46 +0000 (30 00:34 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Oct 2013 23:34:46 +0000 (30 00:34 +0100)
tree302e4e169f1ea43dd4ed2654aa206df3832cc7f4
parent929a422a3c8e79421878e609578ff11a53ac5796
parentd80bdb7431548cbb37cb72cd18fdff52c4ccf49f
Merge branch 'maint'