From: Eddie <dev@fun2be.me>
Date: Tue, 2 Jun 2015 16:16:08 +0000 (+0100)
Subject: Merge branch 'feature_client'
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=WeStealzYourDataz.git;a=commitdiff_plain;h=d9dfedaf9d63e75523322ccdbe77ac4bf5d41586

Merge branch 'feature_client'
---

d9dfedaf9d63e75523322ccdbe77ac4bf5d41586