ref: 0105f6eeb088e43f9ddcc1843663683a202ce6f0
parent: 30218eb3d6c0b523a302ac38601b4630c564aeb1
parent: 1202e68d2f695d4b91d184bd43139dbe10cb8131
author: yenatch <[email protected]>
date: Tue Feb 4 16:34:04 EST 2014
Merge remote-tracking branch 'kanzure/master' into nuke-globals