Merge branch 'master' of git://gitorious.org/crawl/crawl into experimental-layouts experimental-layouts
authorPete Hurst <pete@streamuniverse.tv>
Thu, 21 Mar 2013 04:30:53 +0000 (04:30 +0000)
committerPete Hurst <pete@streamuniverse.tv>
Thu, 21 Mar 2013 04:30:53 +0000 (04:30 +0000)
commite9ca16984cf4c7389fb071a1797b769a118af5ed
tree988fb9b65a146cd20cd1fc40fedadb802283e062
parentdcce51ca0383e00bb2ca7272146fe30fe41e61e5
parent1263e155719ad89fbd1eb75d07e47330824ce092
Merge branch 'master' of git://gitorious.org/crawl/crawl into experimental-layouts

Conflicts:
crawl-ref/source/mon-project.cc
crawl-ref/source/abyss.cc
crawl-ref/source/dgn-proclayouts.cc