Michael Vogel 572678fef9 Merge commit 'upstream/master'
Conflicts:

	include/dba.php
2012-04-13 00:10:41 +02:00
..
2012-04-09 11:49:33 +02:00
2012-04-10 20:50:31 -07:00
2012-04-10 18:08:06 -07:00