summaryrefslogtreecommitdiffstats
path: root/zoneminder
diff options
context:
space:
mode:
authormakefu <makefu@syntax-fehler.de>2011-06-30 23:38:47 +0200
committermakefu <makefu@syntax-fehler.de>2011-06-30 23:38:47 +0200
commitff9c69723a1f9b77c0d1f605ffacafd8732cd199 (patch)
treeabf68a52c8c989ff7ea8d31942b60222bc094570 /zoneminder
parentff29991315b26216a69a9c362747913f3b0482dc (diff)
merged fixes from testing on monitoring.shack
check_btcguild_miner: tries json and then simplejson to import, fixes try-except block
Diffstat (limited to 'zoneminder')
0 files changed, 0 insertions, 0 deletions