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)
commit3481d004e4a688e599b8c6284e0e5372e2708d83
treeaa3844ccd7a97f66121f5548ee50743c71303087
parentce836a433a90323fddf8acff21624ac99b9f5e49
parent6196fa7a14b83917e3333cb067abb03c63dbcc4f
Merge branch 'rettichschnidi' into android