Merge branch 'master' of orgmode.org:org-mode
commitf089a9e914ec4576822420fcadf382ecca35e9d3
authorEric Schulte <schulte.eric@gmail.com>
Mon, 13 Jun 2011 21:06:09 +0000 (13 14:06 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 13 Jun 2011 21:06:09 +0000 (13 14:06 -0700)
tree97cdaee2612634d7a49765a646cdc8c9d5e9ceec
parent5d7e0b79c9896d903357f821d200901a4ceaf923
parent3ed5915f01ac5647db5f2204dc695519653b1190
Merge branch 'master' of orgmode.org:org-mode