Merge mainline changes
commit8ab339ee4291afd48eb29bdd555dd3e0c9ceeee1
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 26 Feb 2013 10:58:29 +0000 (26 11:58 +0100)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 26 Feb 2013 10:58:29 +0000 (26 11:58 +0100)
treed8f15fbfb9c3b46ba350b4a4709a6c29a725b4cd
parent1935591fdb915b52ccfd49081f0ba77697d32216
parent088b33443bffe958b7f9121e9b4dfa4228b29516
Merge mainline changes