Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master:
This commit is contained in:
Simon L'nu 2012-06-05 12:46:42 -04:00
parent c7b1b4b752
commit 5bb4a5912b

Diff Content Not Available