[tor-commits] [bridgedb/develop] Merge branch 'fix/update-gsoc-text' into develop

[isis at torproject.org]

commit fff100491206a0bc943c22e5876b0561f9b7ba57
Merge: a41cf0d d5f2563
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Mar 6 21:41:05 2014 +0000

    Merge branch 'fix/update-gsoc-text' into develop

 doc/gsoc2014-volunteer.txt |  117 ++++++++++----------------------------------
 1 file changed, 26 insertions(+), 91 deletions(-)