Ingo Schommer e2c1a7111e Merge branch '1.0'
Conflicts:
	.travis.yml
	composer.json
2013-04-07 14:26:00 +02:00
..
2013-03-26 13:55:21 +01:00
2013-03-26 13:55:21 +01:00
2013-04-07 14:26:00 +02:00