Merge branch 'master' into various-fixes-and-enhancements
commit0a1fe260544a367e4473c53367e9453016e90c04
authorBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 12:24:53 +0000 (5 14:24 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 12:24:53 +0000 (5 14:24 +0200)
treee4f4ec5a39e260e031cfda29ffe8df1a052eae64
parent7c513b3047ceff0fb60ce344646838d597c8d122
parent5cbc56a17517f2081f0ef236bae85cbd0bfd144a
Merge branch 'master' into various-fixes-and-enhancements