log python/git_merge_master.py @ 794:e059c4e85d9f

age author description
Tue, 04 Mar 2014 16:19:37 -0800 Jeff Hammel STUB: python/git_merge_master.py
Tue, 04 Mar 2014 11:19:19 -0800 Jeff Hammel stub for merging from master