Merge branch 'master' of gitorious.org:capillary/capillary_rb
authorChristian Johansen <christian@gitorious.org>
Fri, 15 Jul 2011 08:49:53 +0000 (10:49 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 15 Jul 2011 08:49:53 +0000 (10:49 +0200)
commit925fee4ceea3b051dbf89e3faa60af5121c4d757
tree4fa1aa1379d55d847baea6b2c7748a42825fff99
parent6aef451a1e152182c03d141d52e68be8484f51f8
parent7b4a45d3dd4f35fb8a2c7f941f59e9f9f70f0f95
Merge branch 'master' of gitorious.org:capillary/capillary_rb
Gemfile.lock