Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e94e42f 489e8f1)

commit	f2935d56d989cf8b7dc5884e0097088509dafd5e
author	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 25 Jul 2011 19:55:16 +0000 (25 21:55 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Mon, 25 Jul 2011 19:55:16 +0000 (25 21:55 +0200)
tree	85ea6274d9c4c63230d60ee3571ebe94327d4bdb	tree \| snapshot (tar.gz zip)
parent	e94e42fb73bb3b35ec3452264ee259efc78fcb38	commit \| diff
parent	489e8f128578972ba6b92bd05c7c7caae95a8bd4	commit \| diff

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

Conflicts:
js/server_status.js
server_status.php

js/server_status.js	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.php	diff1 \|	diff2 \|	blob \| history
server_status.php	diff1 \|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
themes/pmahomme/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history

Drizzle / GSOC 2011