Merge branches 'upstream', 'dev/dl_ul' and 'dev/i18n'
commitdb2483f0097336f415c23cc15dc8689cb410ed83
authorygrek <ygrek@autistici.org>
Sun, 1 Aug 2010 14:14:58 +0000 (1 17:14 +0300)
committerygrek <ygrek@autistici.org>
Sun, 1 Aug 2010 14:14:58 +0000 (1 17:14 +0300)
tree446eaf8341ae8de84a5bdc47671fec3f9e36c42b
parentb9e192701cb42c0f03e0b962a2eb9e25af428788
parentbc778c3676cd040326f65bb0d791149a163dc1f3
parent11a7b749e78136cac5ae3aad12a8f24c92eb3e56
Merge branches 'upstream', 'dev/dl_ul' and 'dev/i18n'