Public Git Hosting - phpmyadmin.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e8b144d f9550ae)

commit	17f8e161413a00bc677f16425803109c3536db79
author	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 15 Jun 2011 13:38:04 +0000 (15 15:38 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 15 Jun 2011 13:38:04 +0000 (15 15:38 +0200)
tree	f0d3e53dbb0e83535294287095001135cebfb4e4	tree \| snapshot (tar.gz zip)
parent	e8b144da1188af7cc1212dbaa97cf6723eb44b0a	commit \| diff
parent	f9550ae3e2808ecc8d82b7528b7a9a3ee92249db	commit \| diff

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

Conflicts:
server_processlist.php

db_structure.php	diff1 \|	diff2 \|	blob \| history
libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/server_links.inc.php	diff1 \|	diff2 \|	blob \| history
navigation.php	diff1 \|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
themes/original/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history
themes/pmahomme/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history

phpMyAdmin