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

* remotes/upstream/master:
  wrap title and text for editplain in zero and TB themes
  correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
  improved contrast in acl selector, and preview (darkzero)

* master:
This commit is contained in:
Simon L'nu 2012-03-04 22:20:42 -05:00
parent 04527bd0b1
commit 290fdefa82

Diff Content Not Available