Merge commit 'origin/arnied-clockchange' into arnied-clockchange
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 28 Jan 2009 17:31:38 +0000 (18:31 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 28 Jan 2009 17:31:38 +0000 (18:31 +0100)
commit296235cfa713ab49f03a2fd0d013b7f7c0ca4774
treed8f460f1bf61e5390c3653d8bdb407afa9f413d3
parent78b3ba9dee44f5d293104ac69ffad52f68dad264
parent8047e088aed2db2dee5aa8d92c27c20ade005c4e
Merge commit 'origin/arnied-clockchange' into arnied-clockchange

Conflicts:
libi2ncommon/src/cron.cpp
libi2ncommon/src/cron.hpp
src/cron.cpp
src/cron.hpp
test/test_cron.cpp