Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.

Conflicts:
	.travis.yml
This commit is contained in:
Andreas Fischer 2012-05-27 15:42:30 +02:00
commit d738441f38

View file

@ -1,6 +1,7 @@
language: php language: php
php: php:
- 5.3.2 - 5.3.3
- 5.3
- 5.4 - 5.4
env: env: