Merge branch 'master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Thu, 30 Dec 2010 07:48:35 +0000 (08:48 +0100)
committerMichal Soltys <soltys@ziu.info>
Thu, 30 Dec 2010 07:48:35 +0000 (08:48 +0100)
commit233e7ecafe6cb5a98a74b595ea00c0017628a3b1
tree75d6b2502dbef2b2436fdac566127b3b510e0970
parentcf340c9990b25663c71bf58b7c4c5c719132661a
parentae77babf0eb01bfbd263a256ff839f501cade3b5
Merge branch 'master' into chaindev