Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commite1278997192542811b44fccc9daf88901b1edc08
authorEric Schulte <schulte.eric@gmail.com>
Mon, 22 Nov 2010 13:44:31 +0000 (22 06:44 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 22 Nov 2010 13:44:31 +0000 (22 06:44 -0700)
tree87df73c5354b0c43bca4ec90aebf8e59af84b121
parent6baa78b2dae566e39654131c1d4d09c9a78f1a82
parent02494667c7a55c0c3118d8895f29d16e17076fe3
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode