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)
commit61883b30f3ea0cd22d08519bc93c73f6e193bd65
treec513abc708a19889f561d5df2875b6bd53e92fd9
parent68c059565a3b75808e74eb481f14cb7f0c907f37
parent278085fa01a9013051fbec842314cb6b5642e9bb
Merge pull request #36 from hansiglaser/master

Various changes merged