Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 15:43:47 +0000 (11:43 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 15:43:47 +0000 (11:43 -0400)
commitddef0d3170b1543e6ed580c7ce00849e3ed1550f
tree96aa1fbcdcb627d4e3cc131f0ec098119eb7acfe
parent9d00f9dfcd5bc55760a19ca476499e3f64a5fe37
parent3ce00b118e9a5f895a295f2a8382959b194e80bf
Merge branch 'master' into autoconfig

Conflicts:

debian/changelog
doc/todo/color_plugin.mdwn
debian/changelog
doc/todo/color_plugin.mdwn