Merge branch 'gpg1x' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Wed, 12 Jan 2011 16:53:16 +0000 (17:53 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Wed, 12 Jan 2011 16:53:16 +0000 (17:53 +0100)
commit3faec932772cef8a63412bfc850f24d71f2a6784
tree75012e7766f763d26ac3223b87b161b061e517e9
parent484f8019f5a0ef222d5c52fe852069079c029cf6
parent6c05e62afcfe24365b857ea73424f1b1bbd8fce9
Merge branch 'gpg1x' into experimental
defaults/initrd.scripts