From: Dmitry Teslitsky <dmitry@teslitsky.info>
Date: Tue, 8 Apr 2014 15:38:13 +0000 (+0300)
Subject: Merge pull request #1 from github/master
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38ba69c4d7ae3579c5a6400c7bf9f7045d5c5cb5;p=gitignore.git

Merge pull request #1 from github/master

Updating fork
---

38ba69c4d7ae3579c5a6400c7bf9f7045d5c5cb5