# HG changeset patch # User Lukasz Forynski # Date 1290300016 0 # Node ID cb014a8b6324b07a46db6155c23c91fe7d086da2 # Parent c61e54f48ab5b1bb146a1ed4a7ac9cb6afcbf0ae# Parent 922af0272d29fb6f0ab92215f283dca977faeae7 merged generic_fixed_and_updates back to default