Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Ashim Shahi 2014-06-18
Parent(s): [09900b][a8e5bd]
Child(ren): [2bf754]