Merge branch 'master' of orgmode.org:org-mode
commit11cd65955354e90fec5cc2f19a21492dc342bd5f
authorBastien Guerry <bzg@altern.org>
Thu, 28 Feb 2013 08:33:51 +0000 (28 09:33 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 28 Feb 2013 08:33:51 +0000 (28 09:33 +0100)
tree7b49ab8f54659c6706ae819e1a4e7472c7dda87b
parent4ba1e40cff58f47c69bc62b108b48ba9f40507c1
parentcbba811a733a1a49213d8df13a7b598f1229212f
Merge branch 'master' of orgmode.org:org-mode