Merge branch 'master' of orgmode.org:org-mode
authorChristian Egli <christian.egli@sbszh.ch>
Thu, 28 Apr 2011 10:12:53 +0000 (12:12 +0200)
committerChristian Egli <christian.egli@sbszh.ch>
Thu, 28 Apr 2011 10:12:53 +0000 (12:12 +0200)
commit2a8ce137f489ceff11c7ee5f40b00adeb813a7ba
tree99e5877c6267bab0fb43a5b7a9ab29d860e6cfa7
parent2e21cd424a8a14c93bd2c88cacc58d3e760bb396
parentaa903a749d449e57ab42ea68b471636753299d82
Merge branch 'master' of orgmode.org:org-mode