Merge branch 'zabbix' slapos-0.4
authorŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 08:43:06 +0000 (10:43 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 08:43:06 +0000 (10:43 +0200)
commit34959dbdf94b1f99d4d23522f765c64450c83043
tree2f474d8bc80fca0ab912847f64b271c0b62cebbc
parente1f2faabbab4fb9efa7204b7dcd8675031fcc0b6
parent5d93f91a76ed4ed38eb8e710b6d0738d77c94685
Merge branch 'zabbix'