Merge mainline changes
commit05bab88f6a2578787b9598ccdf1e856cfdbd2828
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Sun, 10 Mar 2013 14:57:26 +0000 (10 15:57 +0100)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Sun, 10 Mar 2013 14:57:26 +0000 (10 15:57 +0100)
tree06f223c7384638bcc1e3940e12e2ca10a8dee3c0
parent850235d404a93a3e011befe27ef139ef8e288759
parente4a14979ffc3c37b48afa97e8633a1ada35d2418
Merge mainline changes