Merge branch 'master' of gitorious.org:bilio/bilio
authorJean-Noël Rouchon <jnoel@sissiou.net>
Sat, 16 Jun 2012 13:37:52 +0000 (17:37 +0400)
committerJean-Noël Rouchon <jnoel@sissiou.net>
Sat, 16 Jun 2012 13:37:52 +0000 (17:37 +0400)
commit7e4f6257c152a007531b706e899c508db9e93a60
tree417530dcb194c335bc92bb494dda4ff38798eae0
parent7303950c004cd664b4f6615b4c4842f0e5c6a173
parent02f60612cdb488a233d12dc2f923c31cbcc6e5cd
Merge branch 'master' of gitorious.org:bilio/bilio

Conflicts:
article.rb
edition.rb
edition.rb