Merge branch 'gsoc-android-2' of git+ssh://repo.or.cz/srv/git/kugel-rb into gsoc... gsoc-android-2
commitbfdeb8283b63de46824f27dcf6b5a88d84b4929d
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Thu, 5 Aug 2010 01:20:42 +0000 (5 03:20 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Thu, 5 Aug 2010 01:20:42 +0000 (5 03:20 +0200)
treeed34c86e0b3cbfc461904e867177732747d63203
parentfe87fd77765fd5e4b9aa6792ad4e24a29a9cf03d
parent2f060c940d7c5c8b50bc7f23acfd154a8ccf4dea
Merge branch 'gsoc-android-2' of git+ssh://repo.or.cz/srv/git/kugel-rb into gsoc-android-2