Merge branch 'master' into free-refcount-ids
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 13 Oct 2015 13:41:54 +0000 (15:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 13 Oct 2015 13:41:54 +0000 (15:41 +0200)

Trivial merge