Ingo Schommer 25b6175e67 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	forms/FormField.php
2013-10-20 13:52:56 +02:00
..
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-10 12:33:55 +02:00
2013-10-10 12:33:55 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-10 12:33:55 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-09-12 16:53:32 +02:00
2013-10-06 19:58:08 +02:00
2013-10-07 14:28:02 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-08 11:37:11 +02:00
2013-10-06 19:58:08 +02:00
2013-10-10 12:33:55 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-10 12:33:55 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-06 19:58:08 +02:00
2013-10-08 12:20:10 +02:00