My commit at Fri Nov 29 19:04:25 FET 2013
Merge remote-tracking branch 'origin/branch_for_rebase'

Conflicts:
	test.txt