Merge branch 'master' into alarm
authorEnrico Zini <enrico@enricozini.org>
Fri, 27 Nov 2009 15:31:57 +0000 (16:31 +0100)
committerEnrico Zini <enrico@enricozini.org>
Fri, 27 Nov 2009 15:31:57 +0000 (16:31 +0100)
1  2 
src/clock.vala

diff --cc src/clock.vala
Simple merge