{"shas":[["1506ae002f8689e4c49946b4f1fdb47e59021939","aa5066533f3b7ac9eb14f661662565e80074bdf0@uni-weimar.de","Merge branch 'master' of github.com:eiklist/dbit2011\n\nConflicts:\n\tHelloTabWidget/bin/HelloTabWidget.apk\n\tHelloTabWidget/bin/classes.dex\n\tHelloTabWidget/bin/eu/HelloTabWidget/CacheSerializer.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/PreferencesActivity.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/R$id.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/R$layout.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/R$string.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/SearchActivity.class\n\tHelloTabWidget/bin/eu/HelloTabWidget/SearchresultsActivity.class\n\tHelloTabWidget/bin/resources.ap_\n\tHelloTabWidget/gen/eu/HelloTabWidget/R.java\n\tHelloTabWidget/src/eu/HelloTabWidget/CacheSerializer.java\n\tHelloTabWidget/src/eu/HelloTabWidget/PreferencesActivity.java\n\tHelloTabWidget/src/eu/HelloTabWidget/SearchActivity.java","Eik List"]],"ref":"refs/heads/master","size":1,"head":"1506ae002f8689e4c49946b4f1fdb47e59021939","push_id":36470998}