[tor-commits] [bridgedb/master] Merge branch 'release-0.1.4'

[isis at torproject.org]

commit e2f859cde0bc96b1d3f525b7b8f1608d09adfbde
Merge: 564f4b9 e5bc105
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Feb 21 23:28:06 2014 +0000

    Merge branch 'release-0.1.4'

 CHANGELOG                         |    6 ++++++
 lib/bridgedb/templates/index.html |   14 +++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)