6.06.2013 Перед Мерже
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	TEST/SOURCE/dbObjectTest.pas