Merge remote branch 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Fri, 27 Nov 2009 09:59:04 +0000 (11:59 +0200)
committerMarko Kreen <markokr@gmail.com>
Fri, 27 Nov 2009 09:59:04 +0000 (11:59 +0200)
commitbe73d86f31db7e87975e3878adf2f1e9638c8db1
tree7b3d286ebc957c689ef3328fa6e6486fe22e7c58
parent2fed3df04c7e9dac065976e5e0ee05baab63f6e5
parent4356cb00e224a744179d7555138e43fe41e0d6fe
Merge remote branch 'martin/master'