Merge commit 'refs/merge-requests/1' of git://gitorious.org/aesalon/aesalon into...
commit2ef8d0c6c6c5b2a8c7a2fb6d625ed2505571eead
authorethereal <ethereal.visage@gmail.com>
Sat, 16 Oct 2010 02:17:24 +0000 (15 20:17 -0600)
committerethereal <ethereal.visage@gmail.com>
Sat, 16 Oct 2010 02:17:24 +0000 (15 20:17 -0600)
treeb9dddf10ad2df3b69f079d8e394b1338a6e83d16
parent26d25b308e813228c5d1d37bf3790e6c26b01129
parent534063aee1959b11b08ad6474a0500f5bdde288f
Merge commit 'refs/merge-requests/1' of git://gitorious.org/aesalon/aesalon into integration