Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2014-08-13 00:18:05 +02:00
..
2014-06-05 17:44:35 +02:00
2014-05-09 20:43:06 +02:00
2013-01-18 23:38:49 -07:00
2012-12-28 14:51:50 -07:00
2014-06-15 23:33:25 +02:00
2013-08-12 11:12:00 +02:00
2012-11-14 13:59:31 -08:00
2014-06-15 23:33:25 +02:00
2012-11-22 03:19:05 -08:00