Merge branch 'master' of orgmode.org:org-mode
commit1df06e0fa9dd7a137f7d0cfc1840264a6c83ccc4
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 6 Apr 2011 07:24:56 +0000 (6 09:24 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 6 Apr 2011 07:24:56 +0000 (6 09:24 +0200)
tree33fbd22f0caa84fa6f5d9fa05b2d72cd68924643
parent8a831e8f6c764dc0808f96f73dfc0e5db2455587
parent7021f70f0221f57fcd35792b76e5dfb3a5f4025f
Merge branch 'master' of orgmode.org:org-mode