diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2010-12-23 13:07:25 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-12-23 13:07:25 +0000 |
commit | 4cda4520eecfd41fafd440f591f82a367943acc8 (patch) | |
tree | eab3bf114fa625335e5ab38e0e12b9d1f30c2583 /main/dbus/dbus.initd | |
parent | bc1ab2d7a874eb891b5152c1fb77af81b7fc5d38 (diff) | |
parent | ee2ff0170d3ddf8da0e217c2f0faec223129b853 (diff) | |
download | aports-4cda4520eecfd41fafd440f591f82a367943acc8.tar.bz2 aports-4cda4520eecfd41fafd440f591f82a367943acc8.tar.xz |
Merge remote branch 'ncopa/master'
Conflicts:
testing/iscsi-scst/APKBUILD
Diffstat (limited to 'main/dbus/dbus.initd')
0 files changed, 0 insertions, 0 deletions