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)
commita7d1a285763bffe81b29c854b905d8ca83e9a2bd
tree230b67f7eeff0bf961762bcf56fd4b9067b61c2b
parentf4d40b59c9ff7acbd94cdbf2551c19d982af1876
parent0d1445c62994145f78d086d08aebe00f92303778
Merge branch 'master' into alarm
src/clock.vala