Merge branch 'maint' of orgmode.org:org-mode into maint
commitcc215fcf168f36ae54d7885ef6d382cb56db19f6
authorBastien Guerry <bzg@altern.org>
Sun, 26 Aug 2012 18:04:54 +0000 (26 20:04 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 26 Aug 2012 18:04:54 +0000 (26 20:04 +0200)
tree62106304421334daab340ed957b53f73164a8364
parent4bde726bbb3d6424c0996e69dde409845fcb0477
parentac0667b8412033590ca0b199b415cce75dfd89fa
Merge branch 'maint' of orgmode.org:org-mode into maint