Merge remote-tracking branch 'amarx/core90' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)
commit61e19f97aa1ee3a68e7b8e720ae1e55940ff43fc
treeec185bf0d2ebab35d8012933c5ceb3f077b2c4ae
parent0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44
parent382ffe320c05b4dc99a77f4e5002265d0e0c70c6
Merge remote-tracking branch 'amarx/core90' into next