Merge branch 'maint'
commitfd5a4f7d3660ff1a9102eaf6d825a5a60c982d9c
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 08:20:58 +0000 (13 10:20 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 08:20:58 +0000 (13 10:20 +0200)
treef604c81e6d5b957e492ca4967c0e9ae5b605a58e
parentbe3dad300feca316cbcd593e054fcbc939cdb280
parent11514badc127a23be25c12394a5084f0e83e8f09
Merge branch 'maint'