andl/etherpad-lite — pull request #1 by morika-t (2012-12-11 03:07:25+00:00)
Title: fix merge conflicts

Settings.js
fix merge conflicts