Merge branch 'master' of gitorious.org:bilio/bilio
authorJean-Noël Rouchon <jnoel@sissiou.net>
Sat, 21 Apr 2012 14:49:23 +0000 (18:49 +0400)
committerJean-Noël Rouchon <jnoel@sissiou.net>
Sat, 21 Apr 2012 14:49:23 +0000 (18:49 +0400)
commit8681efa7bc3dea728d5f47130db0019d69447864
tree188051bff59556fb60cd9639b7e39167f501cf4b
parent95c819a9157699251f9a539275d188a04d5801ff
parentdbed2874668d398f682736d0f65c7b85dbb78751
Merge branch 'master' of gitorious.org:bilio/bilio

Conflicts:
liste_tiers.rb
liste_tiers.rb