Lucas Pleß ec3620df77 Merge branch 'maint/henne' into maint/lp		2012-03-24 22:00:51 +01:00
..
main	Merge branch 'maint/henne' into maint/lp	2012-03-24 22:00:51 +01:00
test/java/de/ctdo/bunti	renamed getDeviceID to getId	2012-03-21 21:22:53 +01:00