Merge commit 'refs/merge-requests/23' of git://gitorious.org/owncloud/owncloud into...

diff --cc inc/templates/adminform.php
index 81b02ac45fcaf2e8ee6e5eccbf451b442d3d3ba9,064201e5c81916973cb601938b53ababeba35503..9846cfee6d3bc979ba160bf81e52479dca4bb3b9
--- 1/inc/templates/adminform.php
--- 2/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
@@@ -115,9 -115,9 +115,9 @@@ foreach($dbtypes as $dbtype)
  <tr><td></td><td><input type="submit" name="set_config" alt="save" value="save" class="formstyle" /></td></tr>
  </table></form><br/>
  <?php
- if(!$FIRSTRUN and false){//disabled for now?>
+ if(!$FIRSTRUN ){//disabled for now?>
  <br/>
 -<form method="post" enctype="multipart/form-data">
 +<form method="post" enctype="multipart/form-data" action="#">
  <table cellpadding="5" cellspacing="5" border="0" class="loginform">
  <tr><td colspan='2'>Create new user:</td></tr>
  <tr><td>user name</td><td><input type='text' name='new_username' class="formstyle"></input></td></tr>

diff --cc inc/templates/configform.php
Simple merge