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)
commitaed8b7176fa4cb067b15d4facf9c6280f4807a95
tree05b9a439ff020863027f6d486abafef5fc695c94
parent7187fdcb9de4bd2d61f794feaedd026f5632c168
parent8c1f16d475dfae3fd8b11f9d6edf344cd2ccfd71
Merge branch 'master' of orgmode.org:org-mode