Merge branch 'fix-docache'
authorSebastian Pipping <sebastian@pipping.org>
Fri, 30 Mar 2012 17:32:40 +0000 (19:32 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Fri, 30 Mar 2012 17:32:40 +0000 (19:32 +0200)
commit8071dca45640168787ef1f0793301f7c871da088
treeb0422c663d3b89b9c20fae2a7a778243d7e1f2b4
parent62b39fafd6b9b383d85fb97a3e6b4183df5068be
parent8ac8de605504c830b411be0d8eaa597e49ac75b1
Merge branch 'fix-docache'

Conflicts:
ChangeLog
ChangeLog
defaults/initrd.scripts