Merge remote-tracking branch 'origin/master' into localizetemplate
commitccfd638d5df45b7c63362ca1bb5ffbdc40e958dc
authorKlap-in <klapinklapin@gmail.com>
Fri, 2 Aug 2013 11:42:08 +0000 (2 13:42 +0200)
committerKlap-in <klapinklapin@gmail.com>
Fri, 2 Aug 2013 11:42:08 +0000 (2 13:42 +0200)
tree58f28f7d39f17dcea473a1d8367913957634623c
parentacd3eb673b5f7c26fc8ec53d0147b30769e2a866
parent363c0a9eb7c11cf712293630c861febb907ce17f
Merge remote-tracking branch 'origin/master' into localizetemplate