Merge branch 'master' into max-sticky-agenda
commitc8aa1d99e119a9392bf34eeb4e9befa70b8f5cad
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 10 Mar 2012 06:03:40 +0000 (10 07:03 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 10 Mar 2012 06:03:40 +0000 (10 07:03 +0100)
tree20b50da2ef9bc6307710067c46216988556a33c1
parent41ab6e292a962de06bf93c912c0b7ddeab8adb40
parent86131a8b5017cd2cec2167a76a8c6233ee58db2c
Merge branch 'master' into max-sticky-agenda