From: Hraban Luyat <hraban@0brg.net>
Date: Mon, 13 Jul 2015 21:47:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'vps/master'
X-Git-Tag: v2.0.0~82
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=f80f6d4113583557ded48996e1d9c549bbc56786;p=go-opus.git

Merge remote-tracking branch 'vps/master'
---

f80f6d4113583557ded48996e1d9c549bbc56786