Merge branch 'next' into core63
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)
commitd22a2dc4c49dfb68e7f171d8bd8395500292835e
tree880f965040ed5dd62a2600934a0fb9a9cd4f5218
parent9b4bd0e29e8f8f743884a327b0a90d2124a7ff97
parent3905a9b7544a09b07af86e2ad2e5af75ecdefa6d
Merge branch 'next' into core63