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

[Peter Lemenkov]

commit e53da84f156f66324ad30d1622ed1d61f129ba84
Merge: 713763b 6d92370
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 28 13:14:24 2014 +0400

    Merge branch 'master' into f21
    
    Conflicts:
    	erlang-basho_metrics.spec

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