Merge branch 'gsoc-android-2' of git+ssh://repo.or.cz/srv/git/kugel-rb into gsoc...