Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Ashim Shahi 2014-06-18
Parent(s): [82c1bd][feb9e3]
Child(ren): [df0e18]