Merge branch 'master' of auder.net:valse
authoremilie <emilie@devijver.org>
Thu, 16 Mar 2017 15:28:52 +0000 (16:28 +0100)
committeremilie <emilie@devijver.org>
Thu, 16 Mar 2017 15:28:52 +0000 (16:28 +0100)
commitfe651987e27a47657554b2bbfce9c19ce4b22944
tree857b6efad0643c34d43ba84019c8e0f985715464
parent12381c92accfc0b7bedc3ce1c338856df1838a73
parent53fa233d8fbeaf4d51a4874ba69d8472d01d04ba
Merge branch 'master' of auder.net:valse