Merge remote-tracking branch 'osp/opensourceprojects' into opensourceprojects
Authored by: João Paulo Barraca 2014-01-24
Parent(s): [5d1504][c4ace0]
Child(ren): [220d32]