diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-16 10:12:43 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-16 10:12:43 (GMT) |
commit | 145db023bcbc82f190cc178744267096b4f0d310 (patch) | |
tree | 48a2353bf30e29df7f3ead334275b42fe4f98ab9 /debian | |
parent | 3c0ad8d19d5659f1cfbe0c6b642dccf1c6a0ef7c (diff) | |
parent | 0893f1cfe12995d4516ae8c9ae7cc6ecc5ac9e62 (diff) |
Merge commit 'upstream/0.4.3'
Conflicts:
python/config.py (dropped: automade, should be dropped upstream too!)
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions