Public Git Hosting - phpmyadmin.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: dd8116c 07f3f59)

commit	627e4133c35c120f4270efa2e0d087d6b6fb07c8
author	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 17 Aug 2011 20:47:20 +0000 (17 22:47 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 17 Aug 2011 20:47:20 +0000 (17 22:47 +0200)
tree	a7d16ccc3cf5d76366dc3ed7559e13e6ac541089	tree \| snapshot (tar.gz zip)
parent	dd8116cc61e691c99e7462198cd72742bb763e02	commit \| diff
parent	07f3f59e22ad0c67eb24f91c58a88898e771fb04	commit \| diff

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

Conflicts:
themes/original/css/theme_right.css.php

themes/original/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history
themes/pmahomme/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history

phpMyAdmin