Ingo Schommer 1088d044c5 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
2012-09-07 17:21:41 +02:00
..
2012-06-27 16:09:31 +02:00