Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
..
2015-11-28 14:29:14 +01:00
2015-06-23 16:13:09 +02:00
2015-10-17 10:48:13 +02:00
2014-09-06 15:52:53 +02:00
2015-02-09 11:21:10 +01:00
2015-10-17 09:41:58 +02:00
2015-10-04 00:28:15 +02:00
2015-05-15 20:41:10 +02:00
2015-11-08 14:42:54 +01:00
2015-11-06 01:19:37 +01:00
2015-10-03 20:24:35 +02:00
2015-10-03 20:24:35 +02:00
2012-11-22 03:19:05 -08:00
2015-03-22 17:12:51 +01:00
2015-08-12 23:37:50 +02:00