Merge branch 'develop'
authorAlex Kellner <alexander.kellner@in2code.de>
Thu, 30 Jan 2014 12:12:28 +0000 (13:12 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Thu, 30 Jan 2014 12:12:28 +0000 (13:12 +0100)
commit9fa9b3cbdc18e677cee71a2a8dd42a18db11033e
treeff575560d952fdc5a9ffab0ef1ab757c10812a34
parentdeb15bc508c3f1dac24c9d932db21bcdb51cc876
parent603af85cf2460d66b13c33872ef2b91983842828
Merge branch 'develop'

Conflicts:
.gitignore
.idea/vcs.xml
.idea/workspace.xml