Merge branch '1.8.0' into 1.8.1
authorBrenden Matthews <brenden@diddyinc.com>
Tue, 26 Jan 2010 21:05:59 +0000 (13:05 -0800)
committerBrenden Matthews <brenden@diddyinc.com>
Tue, 26 Jan 2010 21:05:59 +0000 (13:05 -0800)
commitc5925930c3a1e42b4b2aabfb4743e4b7f85d1800
tree35b2e70e2820d8247409058f7662b902aff19698
parent61ad0c2159131902db26dfe96ff011709b5574fa
parent000acfe0fd6fa0d6f6e284676af079e8ef9397d8
Merge branch '1.8.0' into 1.8.1

Conflicts:
src/conky.c
src/conky.c