log python/git_merge_master.py @ 903:08da6a1bb4c9

age author description
2014-03-05 Jeff Hammel STUB: python/git_merge_master.py
2014-03-04 Jeff Hammel stub for merging from master