diff options
| author | Juergen Daubert <jue@jue.li> | 2009-07-29 10:55:07 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2009-07-29 10:55:07 +0200 |
| commit | 427532386cfd1acb93a48a3bb2303d837f25cd6f (patch) | |
| tree | 3f2e9b5880b33b4f7662944e9ab6b8b49b6a0dde /lvm2 | |
| parent | 301276c0d3d279b0eddc14f046958004692bdf4c (diff) | |
| parent | 965688ec08d7b2f6717f4c72374e580a538be89c (diff) | |
| download | opt-427532386cfd1acb93a48a3bb2303d837f25cd6f.tar.gz opt-427532386cfd1acb93a48a3bb2303d837f25cd6f.tar.xz | |
Merge branch '2.5' into 2.6
Conflicts:
lftp/.md5sum
sudo/.md5sum
sudo/Pkgfile
Diffstat (limited to 'lvm2')
0 files changed, 0 insertions, 0 deletions