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
..
2011-09-12 09:12:46 +02:00
2011-09-29 09:38:40 +02:00
2011-10-16 14:05:18 +02:00
2011-10-16 14:05:18 +02:00
2011-09-29 09:38:40 +02:00