Florian Schmaus 50e068b6a7 Merge branch '4.0' ... Conflicts: build.gradle		2014-09-29 14:00:48 +02:00
..
src	Merge branch '4.0'	2014-09-29 14:00:48 +02:00
build.gradle	Init Base64 test encoder for unit-tests	2014-09-07 17:22:55 +02:00