Merge remote branch 'origin/development' into text_themes
authorCory Chaplin <cory.chaplin@laposte.net>
Mon, 14 Apr 2014 12:29:03 +0000 (14:29 +0200)
committerCory Chaplin <cory.chaplin@laposte.net>
Mon, 14 Apr 2014 12:29:03 +0000 (14:29 +0200)

Trivial merge