Merge branch 'fa-dev'
authorThérèse Godefroy <godef.th@free.fr>
Fri, 14 Oct 2016 12:27:50 +0000 (14:27 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Fri, 14 Oct 2016 12:27:50 +0000 (14:27 +0200)
commit24e2aec06856a8a86ddf86d7744da1d1e2c85922
tree3a3140da772ad80b43b144e7da330dbbd8667afa
parentbe1ae08be1f9f647ee329151bc8061dab79ac026
parentc8014e3503a808840356bd7919ef84c70c2e02e8
Merge branch 'fa-dev'