Merge branch 'master' into mirceakitsune/power
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 21:28:57 +0000 (23:28 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 21:28:57 +0000 (23:28 +0200)
commitcd68755bc0814a4cd9b05021050edec7dcd718e7
tree3b7f431d9a60c3dfe7604ebecc425be8d6f53e7e
parent6b19b6344e615371602a8fb2eab8a63b47811089
parent209e899df52dbe606bae5d9137067214f66702ff
Merge branch 'master' into mirceakitsune/power