Merge remote-tracking branch 'upstream/master'
authorBerg San <bq@n-bc-bs.lclhst.lan>
Thu, 26 Dec 2013 14:12:34 +0000 (15:12 +0100)
committerBerg San <bq@n-bc-bs.lclhst.lan>
Thu, 26 Dec 2013 14:12:34 +0000 (15:12 +0100)

Trivial merge