Merge branch 'master' into 0.19.x
authorStefan Behnel <stb@skoobe.de>
Wed, 8 May 2013 19:09:32 +0000 (21:09 +0200)
committerStefan Behnel <stb@skoobe.de>
Wed, 8 May 2013 19:09:32 +0000 (21:09 +0200)
commitf35159c9cbad6f3836697458b176b9c7cc6c81f6
tree3d704324ad882f40f94e1821b2e00a5ed74afbf5
parent1491df80144a13ac4c6d8027283f7619a716fb58
parent5574592e569e0cce5f1277b6f0c441d6d19122b5
Merge branch 'master' into 0.19.x