OSDN Git Service

Merge branch 'elliena-bulmer-master'
authorLatif Khalifa <latifer@streamgrid.net>
Thu, 16 Jul 2015 16:37:27 +0000 (18:37 +0200)
committerLatif Khalifa <latifer@streamgrid.net>
Thu, 16 Jul 2015 16:37:27 +0000 (18:37 +0200)

Trivial merge