Merge commit 'refs/merge-requests/2' of git://gitorious.org/be/be
authorChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 19:55:14 +0000 (15:55 -0400)
committerChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 19:55:14 +0000 (15:55 -0400)
commit96438469d6c4c97d5c2fc14f6a26ece147fc75b2
tree548e492d18251ab468973eb8f3479f37bc2a2d17
parent62e4f0eda96b09e39ced25f770df03bbda097d88
parentdf74ec8ead6b7dfe6081062eafa8785728323c9d
Merge commit 'refs/merge-requests/2' of git://gitorious.org/be/be