# HG changeset patch
# User Chris Cannam
# Date 1280317735 -3600
# Node ID 93b07183b4a9cca65c6860c29ab147c886f411dd
# Parent  7c48bad7d85d3749baf3e19862f3c6b887d1a640# Parent  9cc62779c13ae34e02de1475308ad31f9733976b
* Merge from default

diff -r 7c48bad7d85d -r 93b07183b4a9 public/favicon.ico
Binary file public/favicon.ico has changed