David Mudrak 01609c9ad9 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-10-24 22:13:01 +02:00
..
2010-07-14 16:40:30 +00:00
2010-03-07 14:58:19 +00:00
2010-09-18 10:37:19 +00:00
2011-03-01 12:26:49 +01:00