Public Git Hosting - phpmyadmin.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e515783 c5eb1f4)

commit	1c2dbf0cbb4793837701014b66a522727bda144d
author	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 22 Aug 2011 09:18:26 +0000 (22 11:18 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 22 Aug 2011 09:18:26 +0000 (22 11:18 +0200)
tree	d1e7c1f11a3e7eca89c285b2551ad92eafd67877	tree \| snapshot (tar.gz zip)
parent	e5157838e52aecb9d8dfdd1a68be3c6049183634	commit \| diff
parent	c5eb1f4d79b4095e91a0201628cc353fd19365fb	commit \| diff

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

Conflicts:
libraries/advisory_rules.txt

Documentation.html	diff1 \|	diff2 \|	blob \| history
libraries/Advisor.class.php	diff1 \|	diff2 \|	blob \| history
libraries/advisory_rules.txt	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
main.php	diff1 \|	diff2 \|	blob \| history
server_status.php	diff1 \|	diff2 \|	blob \| history

phpMyAdmin