Merge commit 'refs/merge-requests/5' of git://gitorious.org/capillary/capillary_rb
authorChristian Johansen <christian@cjohansen.no>
Fri, 28 Jun 2013 21:49:07 +0000 (23:49 +0200)
committerChristian Johansen <christian@cjohansen.no>
Fri, 28 Jun 2013 21:49:07 +0000 (23:49 +0200)
commitececd243e032cc06348d4b91af9033e1435c93ce
treecdae9803157c6a24306a36ea93b58e7455f88c97
parente4118a110669b7f5de1c6df2f710bc2423ff02f2
parent6dee247fb5163a7b8b1741196a7051cf5fae72e5
Merge commit 'refs/merge-requests/5' of git://gitorious.org/capillary/capillary_rb