Merge branch 'master' of orgmode.org:org-mode
commit5da2745fb8a2dd7c558c7a36c5bc1ce8ce9c4b1c
authorLuis Anaya <papoanaya@hotmail.com>
Sun, 19 Aug 2012 17:14:05 +0000 (19 13:14 -0400)
committerLuis Anaya <papoanaya@hotmail.com>
Sun, 19 Aug 2012 17:14:05 +0000 (19 13:14 -0400)
tree24c5111dffa748ca5db07d2af590d1a842dcbded
parent08c6b3d2e3f91854d89616074532d91b6b52efd8
parent92271aecea5de800538fed427a3620dcc3859d9b
Merge branch 'master' of orgmode.org:org-mode