Zentyal/zentyal — pull request #837 by javierag (2013-12-13 12:09:07+00:00)
Title: fixed merge code typo in js and added some missing semicolomns for style...

... purposes