Resolve
authorMike Taylor <mike@indexdata.com>
Tue, 9 Dec 2014 15:17:59 +0000 (15:17 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 9 Dec 2014 15:17:59 +0000 (15:17 +0000)

Trivial merge