# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1214660994 -7200
# Node ID 0c36b6c991f9e849c2d6b5dec005cdd4191d2333
# Parent  2275041e7debe5ddf2b2b749fa334b1ac9c07bfe# Parent  3989df387ff721bc31ea4c27ad9e16c82e614e18
Merge with stable

diff -r 3989df387ff7 -r 0c36b6c991f9 hgkw/keyword.py
diff -r 3989df387ff7 -r 0c36b6c991f9 tests/test-keyword.out