Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 12:40:26 +0000 (13:40 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 12:40:26 +0000 (13:40 +0100)
commit714b3722784364f34dbb9a8b28039938806726aa
tree28b466abd2a2b61e61f589e65ef7334853f2c4e2
parent733a6fe0634f6be3157be4183f22317885337143
parentb425e2a2d6277d59749dcd7ce04336092eeaaeae
Merge branch 'maint'