Public Git Hosting - phpmyadmin-themes.git/commit

commit	34e783554cb5056bdb7ff649a5c1b93d0a93f609
author	Michal Čihař <mcihar@novell.com>
	Tue, 1 Mar 2011 15:34:20 +0000 (1 16:34 +0100)
committer	Michal Čihař <mcihar@novell.com>
	Tue, 1 Mar 2011 15:34:20 +0000 (1 16:34 +0100)
tree	383f5e5ce9ac6f2e5cf3a9e573452716489d0145	tree \| snapshot (tar.gz zip)
parent	945736dce4a21bc078ad8787cd8add23b63a4847	commit \| diff
parent	60ebf68beda3dc52be85e92b655a03dfc59fbfae	commit \| diff

Merge branch 'phpmyadmin-integration'

Conflicts:
.gitignore