Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 2 Dec 2011 15:36:48 +0000 (17:36 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 2 Dec 2011 15:36:48 +0000 (17:36 +0200)

Trivial merge