Merge branch 'master' into android-test-pluginsandroid-test-plugins
commit176a00309c2333068473e1ebd054c0d7b8e3fd21
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 13 May 2011 11:39:05 +0000 (13 13:39 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 13 May 2011 11:39:05 +0000 (13 13:39 +0200)
tree48f5695e3909867800f6d0abe413e8badf2b3fd3
parentf3924dc0e32b6129e057eb0be5ce7d917dc518a1
parent45d0dcabd64c6f12d120a2445d11d0775833310b
Merge branch 'master' into android-test-plugins