Merge branch 'master' into weather-forecast
authorCesare Tirabassi <norsetto@ubuntu.com>
Mon, 3 Aug 2009 17:59:36 +0000 (19:59 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Mon, 3 Aug 2009 17:59:36 +0000 (19:59 +0200)
1  2 
doc/variables.xml
src/conky.c

Simple merge
diff --cc src/conky.c
Simple merge