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

* remotes/upstream/master:
  some admin page fixes and cleanup
  changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
  string update
  some testbubble stuff
  can_write_wall documentation

* master:
This commit is contained in:
Simon L'nu 2012-03-05 23:36:22 -05:00
parent 321b651635
commit 2a3aaca88d

Diff Content Not Available