Merge remote-tracking branch 'amarx/INDEX' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Mar 2014 20:35:15 +0000 (21:35 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Mar 2014 20:35:15 +0000 (21:35 +0100)

Trivial merge