Merge branch 'master' of orgmode.org:org-mode
commit77a6acff0b4533e51cc6c85799065cb178aaa735
authorBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 23:23:46 +0000 (19 00:23 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 23:23:46 +0000 (19 00:23 +0100)
tree21ccee665b7bec41bef66cd0275d39778a31a039
parent57e0814ac0c9df8abffafc58efd66872f6233873
parent27d7d0ea174c3d3975e4ac2e8a0ecfac9401ba61
Merge branch 'master' of orgmode.org:org-mode