Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: James Williams 2014-06-12
Parent(s): [423f1d][9c318d]
Child(ren): [7a230f]