ref: 1185d69819af3493fe8ace9f576fee4b420db55e
parent: f1667eb6b533eafbb5121ac605401df69960f6df
parent: fb11ff7e55be56cef9234c8443614f04f2157a1e
author: yenatch <yenatch@gmail.com>
date: Fri Sep 19 09:15:47 EDT 2014
Merge remote-tracking branch 'origin/master' into tentative