Merge branch 'maint'
commit3726464268c2fc65ab3f39f7a229fc533f0cfdae
authorBastien Guerry <bzg@altern.org>
Mon, 2 Sep 2013 11:16:18 +0000 (2 13:16 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 2 Sep 2013 11:16:18 +0000 (2 13:16 +0200)
tree829f53380b10106818c3f48c2bd594e76b986f5e
parent15ae89b3949f52db1b5579e383c2d9f6c9173992
parente492bce3c16668d554707955f64be2211cf2b03c
Merge branch 'maint'