Merge remote-tracking branch 'amarx/BUG10796' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)
commitb171633c7e15a1fceacfae9953ad9b5b6a07e945
tree5eef989a75785bdb5676904d306620482c842b9e
parent32a5fec71c317aa47ad27abecd3a63bda513972b
parent212fd689a30a7b2f627149ead8d45823dc8a68af
Merge remote-tracking branch 'amarx/BUG10796' into next