Merge branch 'hotfix/3.1.5.3' 3.1.5.3
authormartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:40:41 +0000 (14:40 +0200)
committermartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:40:41 +0000 (14:40 +0200)
commit6b9325e67b2d607eb24b2d2fe52cba8b4b92e66f
tree3632b86e9ebbc8060a3d9fe6b40e3eb9141c395f
parent49ac8090682a5d76b577eeade3e29c9e4d83650c
parenta7d76ba02aecd5b3bbc0e2b009b1a6e182b97d62
Merge branch 'hotfix/3.1.5.3'