Merge branch 'master' into android-test-plugins
commit2deb5141c7ebdec6969446fb4a4aa75f6996f8c3
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Thu, 27 Jan 2011 21:10:48 +0000 (27 22:10 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Thu, 27 Jan 2011 21:10:48 +0000 (27 22:10 +0100)
treedb9ca8fe4747f68ddeab27b7c4d11da271c0e3ff
parent9fa6de51d22da081cdadf30e657023cef9eb47d3
parent59e207251a1b4a68e9b7d13414253368f0efb000
Merge branch 'master' into android-test-plugins