# HG changeset patch
# User asaha
# Date 1435206979 25200
# Node ID cdb05a5db1e3f9f1d1cacba964d3a95e6c45cab7
# Parent  0cc9360761a5974fcac4aeb9774294f8094a869a# Parent  169e29e8313f79288aca15cfb0261c7552b98313
Merge

diff -r 0cc9360761a5 -r cdb05a5db1e3 .hgtags
diff -r 0cc9360761a5 -r cdb05a5db1e3 make/hotspot_version