Merge branch 'master' into i18n
authorwaker <wakeroid@gmail.com>
Sun, 12 Jun 2011 11:49:37 +0000 (13:49 +0200)
committerwaker <wakeroid@gmail.com>
Sun, 12 Jun 2011 11:49:37 +0000 (13:49 +0200)
commit8130fa1771978168a150007cb99c9d35f96299c2
tree2e338a6fa6eb24169ff6559a920867897b2e32d9
parent93f1a685a17cdf551a158bd1d6b74c3339299537
parent9b946af59ebce3c990809036916feb3081ccce57
Merge branch 'master' into i18n