Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 08:47:30 +0000 (10:47 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 08:47:30 +0000 (10:47 +0200)
commita959d2320104747f1d34e22ce9b64acde71d18ec
tree26eab6601c79fdb3052b685fdd0d88dd68bd59c8
parent8c1f16d475dfae3fd8b11f9d6edf344cd2ccfd71
parent3dd3100794e90f7a44eb17118d1c084299868621
Merge branch 'maint'