Merge branch 'master' into core50
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
commitcbb914abe8dd48de5c055ba88d4d906e972a3c5a
tree14fa7437da3c75990b3a442a6d5cdb8cd1d6f23d
parent601099d677a3401b21a8579933c4b2d51f0a5799
parent10ad048deccf8a42b5850e9197619a91756d3906
Merge branch 'master' into core50

Conflicts:
config/rootfiles/core/50/filelists/icons