Merge branch 'maint'
commitd4710bd0aa8d73b682bac0b1bba433f8b9cd41ff
authorBastien Guerry <bzg@altern.org>
Mon, 23 Dec 2013 05:58:46 +0000 (23 06:58 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 23 Dec 2013 05:58:46 +0000 (23 06:58 +0100)
tree79d0f4624ae0c58ecbdcaa73abe4f287be1ffc69
parentacfe7255ff094bf933201f106faa0735f84f2a47
parentfc3857b3102aa3443d509eee04bf22eaa7bd8c59
Merge branch 'maint'