Merge branch 'master' of orgmode.org:org-mode
commite401ec09ecb27d79911cc7e7d692d146e8e977e5
authorDavid Maus <dmaus@ictsoc.de>
Wed, 23 Nov 2011 20:35:47 +0000 (23 21:35 +0100)
committerDavid Maus <dmaus@ictsoc.de>
Wed, 23 Nov 2011 20:35:47 +0000 (23 21:35 +0100)
tree92833b10cf4ecd33a37faebf9bbe5cd9101ebfa9
parent4d312a07f5965247dccd8993b362d881fcf0bbdc
parent38f70b7e259135efdb9fd2660115f123180d1ecf
Merge branch 'master' of orgmode.org:org-mode