]> git.itanic.dy.fi Git - rrdd/commitdiff
Merge branch 'master' into itanic
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 3 Sep 2011 07:55:42 +0000 (10:55 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 3 Sep 2011 07:55:42 +0000 (10:55 +0300)
Conflicts:
database.h


Trivial merge