fix up from merge
commitb1d8d227069f3cc0d565468dfd4565dfc82c9a89
authorDean Hamstead <dean@fragfest.com.au>
Tue, 15 Nov 2011 05:34:06 +0000 (15 16:34 +1100)
committerDean Hamstead <dean@fragfest.com.au>
Tue, 15 Nov 2011 05:34:06 +0000 (15 16:34 +1100)
tree9849c1e3420e1d55730b4ea11660c44ffafab19d
parentd6c370a6b86a6cfc70a10c09c358eadf78d3da02
fix up from merge
src/lib/Torrus/Renderer/RRDtool.pm
src/lib/Torrus/SiteConfig.pm