Merge some work by Jens-Andre Koch

Only his changes to the core are presented here.
Unfortunately, the skin itself looks ugly on Opera,
and simply doesn't work on Firefox...

Merge branch 'master' into znc-ation

Conflicts:
	modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
	modules/data/webadmin/tmpl/settings.tmpl
This commit is contained in:
Alexey Sokolov
2012-04-10 23:10:36 +07:00
38 changed files with 272 additions and 1542 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
<table class="data">
<thead>
<tr>
<td style="width: 10px;"></td>
<td></td>
<td>Key</td>
</tr>
</thead>