Merge remote branch 'origin/master' into samual/balanceSamual
authorsamual <samual@samual-desktop.(none)>
Thu, 20 May 2010 07:58:12 +0000 (03:58 -0400)
committersamual <samual@samual-desktop.(none)>
Thu, 20 May 2010 07:58:12 +0000 (03:58 -0400)
Conflicts:
balanceSamual.cfg

1  2 
balanceSamual.cfg

Simple merge