summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorParabola <parabolavnx@lions.dreamhost.com>2011-02-20 17:12:07 -0800
committerParabola <parabolavnx@lions.dreamhost.com>2011-02-20 17:12:07 -0800
commit6b52145fff48af649956cb5be145dff157d3ca58 (patch)
tree2335c04a1ca4e86a6f76ae5923d89cf367a93ad1 /config
parentc6516eca2803b780a01a6b2bf3e081c8bd570301 (diff)
parent0162a16595059e269ba2d7b47e69212bc2ab1336 (diff)
Merge branch 'master' of http://projects.parabolagnulinux.org/dbscripts
Conflicts: db-functions
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions