Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)
commit117e37e35699860267699b5662516964b59e3eb2
tree00dddfb507d9c90d14979e3d889e5b36489e0b37
parent4b492e272b065ae89b17fbf63d2244b0d1d1660e
parentea2b3bf4d5033ff99a89d3a5361663837d88aff8
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next