Bastien Guerry 60b23bdeac Merge branch 'maint' ... Conflicts: contrib/lisp/htmlize.el etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc lisp/org-exp-blocks.el		2013-01-01 16:06:17 +01:00
..
langs	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
library-of-babel.org	Fix old Babel syntax	2012-02-18 09:15:44 -07:00