Merge branch 'master' of orgmode.org:org-mode
authorChristian Egli <christian.egli@alumni.ethz.ch>
Wed, 7 Sep 2011 13:45:40 +0000 (15:45 +0200)
committerChristian Egli <christian.egli@alumni.ethz.ch>
Wed, 7 Sep 2011 13:45:40 +0000 (15:45 +0200)
commit2178b635455fbeacfe447a94fb2bbf95ccc9622e
tree164f358b8e76e76ee6e1f30f1db357e6d7473aa6
parent14304f6dcd18df99f39e47bd07e998ead382c3d1
parentf1746a51185083b9368810d2d013e73332f90301
Merge branch 'master' of orgmode.org:org-mode