Merge branch 'master' into slapos
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Jun 2013 09:54:25 +0000 (11:54 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Jun 2013 09:54:25 +0000 (11:54 +0200)
commitc187a52909c1c91fb02aadab2ed20ebc2d1afac3
tree29fcc27a6ffde3bcfb178ffd3063206af927ccc1
parent62f3b64df1c996403b9f461436d94770649c824e
parentf7ede01a96fc895d8bf1e282adbc1f5b159c46e1
Merge branch 'master' into slapos