Merge branch 'maint'
commit2cb8b1401c3361465f50ace0b84c1770c5fa9fb4
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Jan 2014 20:43:43 +0000 (27 21:43 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Jan 2014 20:43:43 +0000 (27 21:43 +0100)
tree3d37dd785006e0f1a2bda014712674fa26db036d
parent2b8fd33d0f68674a712b0c015615a06079df1bcc
parent43870228c586e20362eea0dd418211a5e2db50bd
Merge branch 'maint'
etc/ORG-NEWS