Merge branch 'master' of orgmode.org:org-mode
commit36def959abb610ed461423a22811bde576fbc805
authorLuis Anaya <papoanaya@hotmail.com>
Sun, 19 Aug 2012 23:42:45 +0000 (19 19:42 -0400)
committerLuis Anaya <papoanaya@hotmail.com>
Sun, 19 Aug 2012 23:42:45 +0000 (19 19:42 -0400)
treef1ce61f208531c92ed101cdc2ff833c7bf97b3b5
parent5da2745fb8a2dd7c558c7a36c5bc1ce8ce9c4b1c
parent523f13dd08fb58c41d931f1d58ed577bf7e1722a
Merge branch 'master' of orgmode.org:org-mode