Merge remote-tracking branch 'origin/development' master del4
authorDominik <muggd1@bfh.ch>
Sun, 10 Jan 2016 13:53:17 +0000 (14:53 +0100)
committerDominik <muggd1@bfh.ch>
Sun, 10 Jan 2016 13:53:17 +0000 (14:53 +0100)
commitc724725c622308db4c2ea5c352bd519a42ccba73
tree2f1ad76ddf2cb751c07c1b28e340b78f7a2af602
parentd9fdf0e9e6c1ac8ebef439dc44514c7106f698a0
parent88a96fa2b5183fed257ff365cc1a5edf98b4d70e
Merge remote-tracking branch 'origin/development'

Conflicts:
.gitignore
pom.xml
src/site/apt/sprint_backlog.apt
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.core.prefs
pom.xml
src/site/apt/sprint_backlog.apt