Merge branch 'master' into repo
commit46716f17b09039bbe9399f804645dc2f6aef8ac0
authorDmitrijs Ledkovs <dmitrij@samara.(none)>
Mon, 19 Jan 2009 23:36:00 +0000 (19 23:36 +0000)
committerDmitrijs Ledkovs <dmitrij@samara.(none)>
Mon, 19 Jan 2009 23:36:00 +0000 (19 23:36 +0000)
treeaedc72eff1702a4bd7c123c6a372bdef1d52ef3c
parentdd3404e0392eb10e9ca21ddc040e809d9eb91288
parent3d076c6de06864eb5e8dc8ede0c7e8ee9f943389
Merge branch 'master' into repo

Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/rules
debian/watch