Merge remote-tracking branch 'amarx/BUG10797' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)
commit32a5fec71c317aa47ad27abecd3a63bda513972b
tree658bc66df28a8952f0e5c94e495da5ce6089ca6a
parentad50a299c8717ffdd3a0ec02b0db40888f5d9e73
parent39d435690fa0fa56886bc95a00f7eb01463b7b80
Merge remote-tracking branch 'amarx/BUG10797' into next