Public Git Hosting - phpmyadmin.git/commit

commit	41c18f611362d4fce75d3bbc90d3aa101736c47e
author	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 19 Aug 2011 22:48:40 +0000 (20 00:48 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 19 Aug 2011 22:48:40 +0000 (20 00:48 +0200)
tree	28a5aa015620390bf148c5468cbddc1cc664a912	tree \| snapshot (tar.gz zip)
parent	11cd7afc7bfa67364ea3fd6a8d86f8c9aae85cbe	commit \| diff
parent	80daf344942c5b60b0c244771b7c18c309edf06d	commit \| diff

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

Conflicts:
libraries/Table.class.php
libraries/Tracker.class.php

phpMyAdmin

libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/Tracker.class.php	diff1 \|	diff2 \|	blob \| history
libraries/advisory_rules.txt	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