summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-20 16:05:10 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-20 16:05:10 -0300
commitc0572dd9e06cd2775348d910433e43b42e05cbb7 (patch)
treefce07be51948d73c8eda6c7966178a61196568af /data
parent52054730687efbd08efa1d36e30074d789ae2d08 (diff)
parent2bb48366937bf0d5191be954ea21c671c3722d04 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/4633-fix-resolvconf-usage' into develop
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions