merged with immerda
authorMarcel Haerry <haerry@puzzle.ch>
Mon, 25 May 2009 08:53:10 +0000 (10:53 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Mon, 25 May 2009 08:53:10 +0000 (10:53 +0200)
commitc1af334f136fe24ad1a544142dfa8ffed1325657
treeb2394a525b7a1cd74335abe6767f7b63a763a5fd
parent4a235226de70fed2c1679c4ec8a432b4c74a65cd
parent1c77a21234e5ba32f4a7c03c727e3e20119784c3
merged with immerda
templates/resolvconf.erb