Merge branch 'feature/#83-alternative-namespace'
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Tue, 24 Mar 2015 12:42:53 +0000 (12:42 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Tue, 24 Mar 2015 12:42:53 +0000 (12:42 +0000)

Trivial merge