Merge branch 'maint'
commit458e6cfb564c8d3d7e1e2c3edd601d9654bfc241
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 5 Sep 2013 16:48:42 +0000 (5 18:48 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 5 Sep 2013 16:48:42 +0000 (5 18:48 +0200)
tree028f2e3f6ba7eeaa8787f7e62dff88a6561914d8
parent5fdb93eb3947d328ea354e9cbd7cad68d3cb3bf5
parent48d32a3c269c900471756fd9a9a0a26897e86a7e
Merge branch 'maint'
doc/org.texi