[tor-commits] [bridgedb/master] Merge branch 'fix/3573-robots-txt' into develop

commit ae9ac1edd0ad74e0ed9a94167aa9d02e3b0ff21a Merge: dbfc091 2c00be5 Author: Isis Lovecruft <isis@torproject.org> Date: Mon Oct 14 01:42:14 2013 +0000 Merge branch 'fix/3573-robots-txt' into develop lib/bridgedb/templates/robots.txt | 1079 +++++++++++++++++++++++++++++++++++++ 1 file changed, 1079 insertions(+)