Merge branch 'remitamine-srgssr'
authorremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 10:38:19 +0000 (11:38 +0100)
committerremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 10:38:19 +0000 (11:38 +0100)

Trivial merge