Markus Makela 0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
..
2015-04-27 04:52:29 +03:00
2015-07-11 17:13:00 +03:00