Merge remote branch 'origin/master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Tue, 10 May 2011 11:54:35 +0000 (13:54 +0200)
committerMichal Soltys <soltys@ziu.info>
Tue, 10 May 2011 11:54:35 +0000 (13:54 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge