Merge branch 'master' into php5

Browse Source

* master:
  PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).

Conflicts:
	composer.json

...

This commit is contained in:

Andreas Fischer 2014-01-30 15:22:26 +01:00

parent 52fa1df044 8664b69e10

commit 34e3aef6aa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available