Merge branch 'upstream'
commit17742106f38a59ff3fdfe60a1bc6d9c917c9b312
authorygrek <ygrek@autistici.org>
Sun, 7 Aug 2011 15:40:27 +0000 (7 18:40 +0300)
committerygrek <ygrek@autistici.org>
Sun, 7 Aug 2011 15:40:27 +0000 (7 18:40 +0300)
tree99ab32f55ca54eafec386cc7cd613c731163334d
parentcdb5572fc3ac0bc25968abfedeb3bf8ea6861016
parenta1a6069907fc4c2a4e39b0f889a8036c2506c679
Merge branch 'upstream'