Merge remote-tracking branch 'amarx/BUG10834' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)
commit9acda8fa69b22f410b2b3787b7fad5cff899488d
tree7879af338d671a8b12178e94c305e83ac28e5942
parent0ed7b61325996686b956ba398ccb830b53253253
parent1d47c971e6bd4490fb54c6dd333f307d89f9cfee
Merge remote-tracking branch 'amarx/BUG10834' into next