Merge branch 'master' into chaindev
commit1f0c7fa0fc340ebd0709c476ccdf2aefcc09c871
authorMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 10:50:32 +0000 (28 12:50 +0200)
committerMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 10:50:32 +0000 (28 12:50 +0200)
tree16f195ae3ee8f2c1d7dd30d25c767b9db53ec209
parent9cbc3a5bfb1b58c5821757749129a67672f8c326
parent6f438cf6d03e45d875b510559246573954e43218
Merge branch 'master' into chaindev