Merge branch 'master' of orgmode.org:org-mode
commitd9426915c0629966e67fd0dd35a56c0833db8ad1
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 21 Apr 2011 14:50:13 +0000 (21 16:50 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 21 Apr 2011 14:50:13 +0000 (21 16:50 +0200)
tree60b399c68ce4dabbc962d8edc523264bae4c6539
parent6660a51e0729ac6568c6b4684f1768f6901576e6
parent8fe51894a30013ba44e2db5eacde55fb22423d79
Merge branch 'master' of orgmode.org:org-mode