Commit 77f5a3f5ed0f2c9f4053119a895f75f5213ccc73
authorMichel Pollet <buserror@gmail.com>
Thu, 9 Jan 2014 10:55:39 +0000 (10:55 +0000)
committerMichel Pollet <buserror@gmail.com>
Thu, 9 Jan 2014 10:55:39 +0000 (10:55 +0000)

Trivial merge