Merge branch 'maint'
commitd19fe8cb72e7b448dad74d6623c64adb24e4e4f6
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 10 Jan 2014 22:04:25 +0000 (10 23:04 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 10 Jan 2014 22:04:25 +0000 (10 23:04 +0100)
treeccafc68d644f526795b4832f7385a18eef01a58d
parent8abdb06274a2708fbea1d3de735b5dba69b7c740
parentde8884f38e774c366d63ebf1ba75575d031cc393
Merge branch 'maint'
doc/org.texi