tkowark/hpi-hiwi-portal — pull request #24 by scriptedSheep (2013-11-18 16:31:37+00:00)
Title: ak-sprint-1

This merges the changes from the ak-team from sprint 1 into the development branch