[erlang-basho_metrics/f21: 2/2] Merge branch 'master' into f21

[Peter Lemenkov]

commit 15b0d474c64f84647800745b9d62fe8ed0512b55
Merge: e53da84 40fc6c2
Author: Peter Lemenkov <lemenkov(a)gmail.com&gt;
Date:   Tue Nov 4 10:45:16 2014 +0300

    Merge branch 'master' into f21

 erlang-basho_metrics.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---