# HG changeset patch
# User amurillo
# Date 1396045347 25200
# Node ID 2627c7be4279478b880d7f643a252d185e4915ec
# Parent  f0ea4d3df1299b6c958e1a72f892c695fca055ad# Parent  758ee76af3cd8a47ac815f238359e577fbda9178
Merge

diff -r 758ee76af3cd -r 2627c7be4279 .hgtags
diff -r 758ee76af3cd -r 2627c7be4279 make/hotspot_version