From: Steven Black <redacted>
Date: Thu, 21 Feb 2013 04:18:52 +0000 (-0800)
Subject: Merge pull request #2 from l1m5/master
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4f9db5274c90776635938a41d2e44d69b8ce7ecc;p=stevenblack-hosts.git

Merge pull request #2 from l1m5/master

Added simple python script to handle automatic updates and merges
---

4f9db5274c90776635938a41d2e44d69b8ce7ecc