Björn Schießle f151376ad5 remove remaining line from merge conflict		2012-10-27 17:06:13 +02:00
..
hooks.php	Checkstyle: NoSpaceAfterComma	2012-10-23 22:53:54 +02:00
versions.php	remove remaining line from merge conflict	2012-10-27 17:06:13 +02:00