Merge branch 'rettichschnidi' into android android
authorReto Schneider <github@reto-schneider.ch>
Sun, 8 Jul 2012 20:57:28 +0000 (22:57 +0200)
committerReto Schneider <github@reto-schneider.ch>
Sun, 8 Jul 2012 20:57:28 +0000 (22:57 +0200)

Trivial merge