Merge mainline changes
commitaa2b32c3f7c33c46ece6059038015e42595a80de
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Mon, 29 Apr 2013 12:44:05 +0000 (29 14:44 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Mon, 29 Apr 2013 12:44:05 +0000 (29 14:44 +0200)
treea0eadec644903b679920bf9c00a4e771b5241948
parent06b0211b4ee03a6f5e22a538f727075215620bb6
parent9e7898e4e94c2715de7d87c6aa29d0768cdbaf2e
Merge mainline changes