Merge branch 'master' into 'master'

Marius Cramer

2014-02-25 0e3e3c99217c80068fe620460c7a331c34fe1b40

 interface/web/sites/templates/database_edit.htm

@@ -63,6 +63,10 @@
                </tmpl_if>
            </div>
            <div class="ctrlHolder">
            <label for="database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
            <input name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
         </div>
            <div class="ctrlHolder">
                <label for="database_user_id">{tmpl_var name='database_user_txt'}</label>
                <select name="database_user_id" id="database_user_id" class="selectInput">
                    {tmpl_var name='database_user_id'}