Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Jan 2010 23:07:07 +0000 (00:07 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Jan 2010 23:07:07 +0000 (00:07 +0100)
commit4faf4f229e652bd6d7e639300fde3a57d5b2e866
tree06bbcc427f56c8663faf9f86b63b72fd997dcf77
parentae0f2e7a9c9f8e3fb86836e2d417dfb52d4c6b77
parentdebe565b7fca362d5adc3dcf91c3c848079c1866
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x