Merge remote-tracking branch 'antzucaro/master'
authornyov <nyov@nexnode.net>
Tue, 15 May 2012 16:02:27 +0000 (18:02 +0200)
committernyov <nyov@nexnode.net>
Tue, 15 May 2012 16:02:27 +0000 (18:02 +0200)
1  2 
xonstat/templates/nav.mako

Simple merge