[tor-commits] [atlas/master] Merge branch 'task-7861'

[karsten at torproject.org]

commit 8f0772de00ceb08da1de5b699897c5c31b03c3f6
Merge: 20ee699 5d6e5da
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Jan 14 10:27:36 2013 +0100

    Merge branch 'task-7861'

 js/router.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)