[tor-commits] [vidalia/alpha] Merge branch 'fixRouterOfflineNotification' into alpha

[chiiph at torproject.org]

commit 6278c9ecac595e91af7c9f10d25144f454d53075
Merge: 3a56ccd 0c5f2db
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Sat Jun 9 17:18:13 2012 -0300

    Merge branch 'fixRouterOfflineNotification' into alpha

 changes/fixRouterOfflineNotification |    3 +++
 src/vidalia/network/NetViewer.cpp    |   13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)