]> git.itanic.dy.fi Git - rrdd/commit
Merge branch 'master' into kaatokone0
authorTimo Kokkonen <timo.t.kokkonen@iki.fi>
Wed, 22 Feb 2012 20:29:58 +0000 (22:29 +0200)
committerTimo Kokkonen <timo.t.kokkonen@iki.fi>
Wed, 22 Feb 2012 20:47:39 +0000 (22:47 +0200)
commit15357f96c915b62246fc324af62b379f5e4b2a8c
treeacd5eb38a0a4c8c0e258dbf6b46cb276805219da
parent5813a7c078116bb9915d2552368ceeda6a65f6c0
parent3c45ddba581f306628e0df9ac7dc3a1c5c508f95
Merge branch 'master' into kaatokone0

Conflicts:
database.h

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
database.h