Merge remote branch 'origin/people/mateu/many_to_many_pod'
authorTomas Doran <bobtfish@bobtfish.net>
Fri, 29 Apr 2011 14:17:38 +0000 (15:17 +0100)
committerTomas Doran <bobtfish@bobtfish.net>
Fri, 29 Apr 2011 14:17:38 +0000 (15:17 +0100)
commit99ef08f21e71391e3598946ea6fd906a20e65c08
tree6940743cb4af7a3703017a301087c4d8c647639a
parentf7cd906d978bed2af71aaa0be18e5df675211c69
parent7040a6cd5a2b1aa0eb7ba504c1ac7b57021b1946
Merge remote branch 'origin/people/mateu/many_to_many_pod'

* origin/people/mateu/many_to_many_pod:
  use relationship bridge terminology with many to many