Specify a php-parser version
Merge pull request #40 from nikic/patch-1

Specify a php-parser version
yml and linebreak fix
https://github.com/schmittjoh/JMSTranslationBundle/issues/35
Keep empty strings
https://github.com/schmittjoh/JMSTranslationBundle/issues/36
tabs => spaces
Merge pull request #43 from cdfre/master

Keep empty strings, Yml line breaks
Change incorrect "master-dev" to "dev-master"
Merge pull request #44 from jonathaningram/patch-1

Change incorrect "master-dev" to "dev-master"
Add support for FormBuilderInterface
Added a test case for FormBuilderInterface
Merge remote-tracking branch 'albyrock87/master'
fix ids on xliff files to be sha1 to avoid merging conflicts
Support labels for repeated field groups
[#57] fix problem with undetermined comparison callback on uasort( , strcasecmp)
rewrote tests to not require a setup project
added travis ci integration
added build status
Merge branch 'bugfix/sha1AsIds' of https://github.com/cordoval/JMSTranslationBundle

Conflicts:
	phpunit.xml.dist
Merge branch 'repeated' of https://github.com/bvleur/JMSTranslationBundle
Merge branch 'bugfix/57' of https://github.com/cordoval/JMSTranslationBundle