Merge V2 branch

2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
--- a/admin/css/forms.css
+++ b/admin/css/forms.css
@@ -65,6 +65,7 @@ form ul.inline li {
    padding: 3px 10px 0 0;
    float: left;
    width: 8em;
+    word-wrap: break-word;
 }

 .aligned ul label {