Merge remote-tracking branch 'klando/for_marko'
authorMarko Kreen <markokr@gmail.com>
Fri, 25 Nov 2011 14:36:40 +0000 (16:36 +0200)
committerMarko Kreen <markokr@gmail.com>
Fri, 25 Nov 2011 14:36:40 +0000 (16:36 +0200)
commit319bce547fc47208f70220ceb88b16c69a7359d8
tree700b40271702d06edd7026f4affac0462eebd486
parent4e4ee32b2f38bdba7737e0754a557cd2b8677f67
parenteb6387479a59f0b9923cb70f24d4b5f442fb1010
Merge remote-tracking branch 'klando/for_marko'

Conflicts:
README
README