Merge branch 'lua'
authorBrenden Matthews <brenden@rty.ca>
Mon, 18 May 2009 04:00:44 +0000 (22:00 -0600)
committerBrenden Matthews <brenden@rty.ca>
Mon, 18 May 2009 04:00:44 +0000 (22:00 -0600)
commit6abbbd50f0c80edec34d9b3afd7677257cc312db
tree660e54232c9ac899268e13a01f19f5d1991a556e
parent914af765e43e6e1b6f8c0d3bde2f4d832e0b8f59
parente7bf480d48daed958539101531215c9effa23f66
Merge branch 'lua'

Conflicts:
src/specials.c
src/conky.c
src/conky.h
src/specials.c