From: Bryan <btbonval@gmail.com>
Date: Tue, 17 Dec 2013 06:34:33 +0000 (-0500)
Subject: Merge filepick.io into feature_vagrant_startup
X-Git-Tag: release-20150131~386^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=340266f81abb79b9f56af47eb840bd45e0879c43;p=oweals%2Fkarmaworld.git

Merge filepick.io into feature_vagrant_startup
---

340266f81abb79b9f56af47eb840bd45e0879c43