Merge branch 'master' of github.com:KaiRo-at/lantea
authorRobert Kaiser <kairo@kairo.at>
Mon, 17 Dec 2012 23:02:28 +0000 (00:02 +0100)
committerRobert Kaiser <kairo@kairo.at>
Mon, 17 Dec 2012 23:02:28 +0000 (00:02 +0100)

Trivial merge