taz-crm / taz-orocrom / 22501e58247

Commits

Aleksandr Smaga committed 22501e58247M12 Jul 2013

Merge branch 'master' into feature/BAP1067-tags

Conflicts:
	app/AppKernel.php
	src/Oro
	src/OroCRM

Showing diff to4f6e3cc0da6