Julian Harnath 71cc4d4998 Merge branch 'master' into app_server
Conflicts:
	src/kits/app/Roster.cpp
2015-09-01 20:07:21 +02:00
..
2014-10-26 23:40:17 +01:00
2015-01-06 15:23:33 +01:00
2015-07-20 21:45:02 +02:00