Georg Ehrke fc632b5795 fix merge conflicts		2012-06-16 09:48:07 +02:00
..
delete.php	fix merge conflicts	2012-06-16 09:48:07 +02:00
edit.form.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
edit.php	fix merge conflicts	2012-06-16 09:48:07 +02:00
move.php	fix merge conflicts	2012-06-16 09:48:07 +02:00
new.form.php	fix merge conflicts	2012-06-16 09:48:07 +02:00
new.php	fix merge conflicts	2012-06-16 09:48:07 +02:00
resize.php	fix merge conflicts	2012-06-16 09:48:07 +02:00