ref: 5ee3337dfd2c132837ac06d79f93fa1e54fe44e5
parent: ea2826e567399307e08c09d01966315086fd0c42
parent: a913cc853e517c2a5a0f79cc72cd5df590d82317
author: Cullen Jennings <fluffy@iii.ca>
date: Fri Dec 13 05:10:40 EST 2013
Merge remote-tracking branch 'upstream/master'