Ingo Schommer b74af926ce Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/travis/before_script
2013-02-18 14:16:12 +01:00
..
2013-02-18 03:02:45 -08:00