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)
commit1039495b9bdc262055b315f60f49167bd300b13b
tree238ba51b983293372cb960bf2afa2c1d5f8a429b
parent9985581d37a9ed1e358d3a30f00bbc21a4167cab
parenta772877fc61426eda6928c52967aa257c4ade111
Merge remote-tracking branch 'antzucaro/master'
xonstat/templates/nav.mako