Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
committerJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
commit564e04c300b4097f54dfea32b6d384a665d73c57
treebd502023cc7fa98bfb6b5ed1faee6971a0c70cc7
parent75e7a7632daf429eb04b102c2710967553dd6ad1
parent124c400f78dc6e711cfb8c7b29f1de1009eb1924
Merge branch 'master' into zykure/approved
xonstat/templates/map_info.mako
xonstat/templates/server_info.mako