Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitb2dcd211f156322963e56266ef4033af2235524d
authorEric Schulte <schulte.eric@gmail.com>
Fri, 25 Jun 2010 16:34:58 +0000 (25 09:34 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Fri, 25 Jun 2010 16:34:58 +0000 (25 09:34 -0700)
tree3707e6f890299144f047cc05e87e7965bb65ae50
parent670b9899b9c5e52a4c848987d522b074e50ad8a4
parent312081b3760fcb076835d4db6167fa4f1ece93f4
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode