Herman van Rink b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky ...

Conflicts:
	Documentation.html - renumbered 6.28 to 6.29

2010-08-25 16:59:54 +02:00

..

darkblue_orange

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

2010-08-19 14:45:18 +02:00

original

Merge branch 'blinky/master' into gsoc2010-blinky

2010-08-25 16:59:54 +02:00

.gitignore

Ignore non official themes.

2010-06-10 10:52:00 +02:00