Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Sun, 11 Mar 2012 19:16:41 +0000 (21:16 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 11 Mar 2012 19:16:41 +0000 (21:16 +0200)
commit56039ed596f11e2bc474bb4429a14b277a453e3e
treeaf01e78eb35b86db6862c3be0e9ec5b7fcfc7c04
parent1eb274c55592c8a0097a88312ab06b02b096da96
parent02b915af54c4033b580875509ecb9388485a5c2a
Merge branch '2.3'