Merge branch 'maint'
commit180fd62245df148dadf6f5c0b2f660eca3438f48
authorBastien Guerry <bzg@altern.org>
Mon, 1 Oct 2012 17:00:18 +0000 (1 19:00 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Oct 2012 17:00:18 +0000 (1 19:00 +0200)
treef57107d5d38617049fc13fad8e6fe0c86e18bab7
parentb134c60454bc8db5bcf054008b4652a380c6a02d
parent857a3921afe267a47fce704c5da361d5e42a23e8
Merge branch 'maint'