Merge pull request #36 from hansiglaser/master
authorClifford Wolf <clifford@clifford.at>
Thu, 29 May 2014 08:26:55 +0000 (10:26 +0200)
committerClifford Wolf <clifford@clifford.at>
Thu, 29 May 2014 08:26:55 +0000 (10:26 +0200)
Various changes merged


Trivial merge