Merge branch 'master' of orgmode.org:org-mode
authorChristian Egli <christian.egli@alumni.ethz.ch>
Wed, 24 Apr 2013 08:21:28 +0000 (10:21 +0200)
committerChristian Egli <christian.egli@alumni.ethz.ch>
Wed, 24 Apr 2013 08:21:28 +0000 (10:21 +0200)

Trivial merge