summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-03-15 00:39:45 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-03-15 00:39:45 +0100
commit4e3bfd9006ba3033a814a392f9bf4bbca060c8a9 (patch)
treeabec94fb94d3910292eae2724866ed8a9f5b1a97 /conf
parente8da1bd0b5f83991d37bc7e8364101c3faa78b3b (diff)
parentcda2dfb7a9e03543eaf407ee26e5046fc589ef29 (diff)
downloadbird-4e3bfd9006ba3033a814a392f9bf4bbca060c8a9.tar
bird-4e3bfd9006ba3033a814a392f9bf4bbca060c8a9.zip
Merge commit 'origin/master' into new
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions