Public Git Hosting - phpmyadmin.git/commit

commit	970262c435ef788c44bfa80fe4a106ac49a23bd9
author	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 15 Aug 2011 10:03:04 +0000 (15 12:03 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 15 Aug 2011 10:03:04 +0000 (15 12:03 +0200)
tree	0ad28800cb421b4741260ca930964eb04177cbf1	tree \| snapshot (tar.gz zip)
parent	2cd6de464839381594438c08262af85ceeb2903f	commit \| diff
parent	e19d93a70c52fd490f0d10da6ac9adc20fbfbc65	commit \| diff

Merge remote-tracking branch 'origin/master' into drizzle

phpMyAdmin

libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.php	diff1 \|	diff2 \|	blob \| history
libraries/relation.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/User_Schema.class.php	diff1 \|	diff2 \|	blob \| history
server_status.php	diff1 \|	diff2 \|	blob \| history