Merge branch 'maint'
authorYann Dirson <ydirson@free.fr>
Mon, 10 Feb 2014 19:56:58 +0000 (20:56 +0100)
committerYann Dirson <ydirson@free.fr>
Mon, 10 Feb 2014 19:56:58 +0000 (20:56 +0100)
commit892f7a4fe59a00a1b1954d59e0e4b01efc5a9c5b
tree6b456cd12e9fba236903f8e4638dec6900da4634
parentefa38419d840fc894be42aa1365db64589baac80
parent5e0be978b2b5e0b8485a2b023189f6be4b9fd4c9
Merge branch 'maint'