f86bbb63d760b3399f047534654fa72097b877d1 9ea4533763bd0a6425885962c473eb14d2c57509 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/beb6acc23439c42c26933072157b4cbe168df097 beb6acc23439c42c26933072157b4cbe168df097 2008-05-23T16:14:31-07:00 2008-05-23T16:14:31-07:00 Merge branch 'stable'. We want to merge master and stable so we can merge stable into master in the future, rather than cp-ing commits between the two. Merge branch 'stable' 7f29ae3c050b64064766cc4be53b878cd1ed1f27 Nathan Weizenbaum nex342@gmail.com