[elpa] 07/07: Merge commit '3f49d2b3934e69d11410d08f1be8e0011237c11c' from diff-hl

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 41ef088456675919e4b56a41f964d50a81a781dc
Merge: 4834a3f 3f49d2b
Author: Dmitry Gutov <dgu...@yandex.ru>
Date:   Sun Aug 10 20:32:38 2014 +0400

    Merge commit '3f49d2b3934e69d11410d08f1be8e0011237c11c' from diff-hl

 packages/diff-hl/README.md         |   17 +++++++++---
 packages/diff-hl/diff-hl-margin.el |   49 ++++++++++++++++++++++++++---------
 packages/diff-hl/diff-hl.el        |   12 ++++++---
 3 files changed, 56 insertions(+), 22 deletions(-)