Change merge icon so it's the same everywhere

This commit is contained in:
Nathan Gray 2011-01-31 16:29:44 +00:00
parent 28d2b6b072
commit bf4800b5a3

File diff suppressed because one or more lines are too long