osclass/Osclass — pull request #1445 by conejoninja (2014-04-06 10:18:18+00:00)
Title: issue #1413 It can not be automatically merged, also I fix it in some ot...

...her places