Merge branch 'maint'
commit1e32d7bf252f997661ead0d95c0b9423a7cbb559
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 May 2013 12:52:47 +0000 (2 14:52 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 May 2013 12:52:47 +0000 (2 14:52 +0200)
treed96b7ee47d70272c9f758e201bb48746766ecef3
parent168c5584f5a41c4c0890f4caa89fc11cff021c4e
parentb7301bd639aa557dd9b57e77df8a8e45ff618740
Merge branch 'maint'