Merge remote branch 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 6 Oct 2009 15:01:23 +0000 (18:01 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 6 Oct 2009 15:01:23 +0000 (18:01 +0300)
commit2c0e16d5478effe8c84db9082847671309f96cdb
tree31c2555ffa8e9a160ff27062c1301edfb5c5f575
parentd4ca6c85bab8574165296fe487f0b6541c7f45b8
parentc488b698c160c235e1be01295c1f3d2724872c98
Merge remote branch 'martin/master'