Revision 108c869bc2fa8a3357dd8afc6b271cbe229732be

Committed on 04/11/2013 6:49 am by Sören Meyer <soeren@xrow.de> [GitHub Diff]

Merge branch 'master' of https://github.com/xrowgmbh/xrowquestionnaire

Conflicts:
design/standard/templates/questionnaire/question.tpl