Merge branch 'master' into chaindev
commitcf340c9990b25663c71bf58b7c4c5c719132661a
authorMichal Soltys <soltys@ziu.info>
Thu, 9 Dec 2010 07:55:55 +0000 (9 08:55 +0100)
committerMichal Soltys <soltys@ziu.info>
Thu, 9 Dec 2010 07:55:55 +0000 (9 08:55 +0100)
tree91eb99c0b125c5aa8d58b106146ce915f117ca16
parentb8e9b0f9bc9148e681862927c5e2393dc1c6e92b
parenta6f3691938a78833fc1643a5dd6db66dbef81644
Merge branch 'master' into chaindev