Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Thu, 21 Apr 2011 10:15:58 +0000 (13:15 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 21 Apr 2011 10:15:58 +0000 (13:15 +0300)
commitc3492973e16d5c34e56b49c8d7e868ee29290606
treea3ac0232a0cd425ebb7bfde85554cfff1d97d41e
parentb44e2be0322e4c68d290a75f6b0cf6eba2d5aab2
parente20619e0718d6c3c6161d4c946b46127ee088861
Merge branch '2.0'