f26251 merge #54 and #68

Authored and Committed by Shinya Kitaoka 9 years ago
    merge #54 and #68
    
        
file modified
+18 -13
file modified
+9 -42