Merge branch 'admin'
commit2dae03950c250cbb2aa96a88b831f300da3f1e04
authorJohannes Sixt <j6t@kdbg.org>
Sat, 15 Nov 2008 21:55:35 +0000 (15 22:55 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sat, 15 Nov 2008 21:55:35 +0000 (15 22:55 +0100)
tree7174ba8c18f62ce6112f3868f425b479c83d2e6f
parent717552bc386c6520fc8139f632a8b8a605301f8b
parent9891de3cc5ed9fbe21395758c2cf8e6411a73497
Merge branch 'admin'