ref: 46722e5b3b1b854a99146e3e069e8977400710ed
parent: dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad
parent: 3379bd7b73b7e6c7e011520c7fc0b2b51422d67e
author: yenatch <yenatch@gmail.com>
date: Fri Sep 19 18:03:57 EDT 2014
Merge remote-tracking branch 'danny/master'