Merge branch 'master' into v2.1
commit95977599e71a75844143bec686b46d1a10a2771c
authorMike Pall <mike>
Wed, 28 May 2014 13:47:21 +0000 (28 15:47 +0200)
committerMike Pall <mike>
Wed, 28 May 2014 13:47:21 +0000 (28 15:47 +0200)
tree73b6bc9cbc90704b69451a664758f96dad978778
parent7400e2c0cc09cfd332f3e9f831872abc343de406
parent7fb503dc8682c97f3922f88494b0e4e5c9b9398e
Merge branch 'master' into v2.1