Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Ashim Shahi 2014-06-23
Parent(s): [1abc4c][87c62a]
Child(ren): [6c9a37][8418cd]