[tor-commits] [bridgedb/master] Merge branch 'hotfix/9959-pas-danglais_install-data' into develop

[isis at torproject.org]

commit 850b5c8313d1c288386130be2c8bc1bec90acd6e
Merge: 6875e46 3654527
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Oct 15 05:54:59 2013 +0000

    Merge branch 'hotfix/9959-pas-danglais_install-data' into develop

 .gitignore               |    4 +
 Makefile                 |    6 +-
 lib/bridgedb/__init__.py |   16 +++-
 lib/bridgedb/_langs.py   |   24 ++++++
 setup.py                 |  183 +++++++++++++++++++++++++++++++++++++---------
 5 files changed, 194 insertions(+), 39 deletions(-)