Merge branch 'maint'
commit09653647074c1f694b2eefeb3cf24abd4e12151e
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 14:28:04 +0000 (4 15:28 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 14:28:04 +0000 (4 15:28 +0100)
tree101727043ab31260c88a40352c483c435ee91af3
parentd09088ca179dbbd784f64cf368ab35ae0b6531ce
parente764dfe80bf40fd134e8e09901b4db398bdef794
Merge branch 'maint'