Merge branch 'implement-iso-week'
commitb11460395790ad6899e62a2c23913a284b8479ca
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 20 Mar 2008 07:45:29 +0000 (20 08:45 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 20 Mar 2008 07:45:29 +0000 (20 08:45 +0100)
tree6dcaebf6485c941c5e93ef5f49ada3dd900985fd
parent1df123fc6832cf09269e29f2a27c30e792e833ca
parent16e15ecd82fcbae612ac78bc263e34697a1327aa
Merge branch 'implement-iso-week'

Conflicts:

ChangeLog
org.el
ChangeLog
org.el