Merge branch 'master' of orgmode.org:org-mode
commitdfeac71699ce5700cc8eaf2dff28999e4e928d5a
authorDavid Maus <dmaus@ictsoc.de>
Sun, 4 Mar 2012 19:57:19 +0000 (4 20:57 +0100)
committerDavid Maus <dmaus@ictsoc.de>
Sun, 4 Mar 2012 19:57:19 +0000 (4 20:57 +0100)
tree499d95ee5597ab4e149ad3c2c21c4ce83dfb897a
parent21c7ad67cf2fb577bc382d65c8b31b65091e29c5
parenta49193da37a926b6848754a48029a79e34309f3f
Merge branch 'master' of orgmode.org:org-mode