log python/git_merge_master.py @ 886:8a86595a6f9c

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