Merge mainline changes
commit9ed3e1a4858f67a6949ec312efaeb4acc3fde09a
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 12 Nov 2013 08:37:39 +0000 (12 09:37 +0100)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 12 Nov 2013 08:37:39 +0000 (12 09:37 +0100)
tree38264111b6ec320aaebc720534851ee82bf84a92
parent9f9450bb3b4997f81f91b0210e1d8e74e6bd1386
parent34cb6c8d2f3e38a59a0232921b3ef17208862064
Merge mainline changes