Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3e0af18 e13aab1)

commit	f678a45cd2315676f60f28f80f518fa60d8ca3e4
author	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 24 Aug 2011 19:40:52 +0000 (24 21:40 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Wed, 24 Aug 2011 19:40:52 +0000 (24 21:40 +0200)
tree	b873b3a5734dfae29380afb15178aac71991f009	tree \| snapshot (tar.gz zip)
parent	3e0af184341eca03f24bd75a2b0c3057c8fca327	commit \| diff
parent	e13aab10879ecf1af6541d8abd0ff9a1d2154537	commit \| diff

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

Conflicts:
libraries/database_interface.lib.php

db_structure.php	diff1 \|	diff2 \|	blob \| history
libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/database_interface.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/export/xml.php	diff1 \|	diff2 \|	blob \| history
libraries/import.lib.php	diff1 \|	diff2 \|	blob \| history

Drizzle / GSOC 2011