Merge branch 'master' into android-test-plugins
commit21830d3ad8840835dcaeb0d66ac0072b05b0ad85
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 1 Feb 2011 23:07:37 +0000 (2 00:07 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 1 Feb 2011 23:07:37 +0000 (2 00:07 +0100)
tree70130858c74ce03856167a289ea4dfc660761661
parentd9b5c344b1f879ecd44c6a43aa3fbe32fd815b96
parentfd7d4342be40ceec35e2339f20a0f80d94361853
Merge branch 'master' into android-test-plugins