Merge branch 'master' of git://repo.or.cz/fripost-web
commit642ae668c5b637c8a54f08eba43a5435c1f1d465
authorStefan Kangas <skangas@skangas.se>
Wed, 20 Apr 2011 11:49:34 +0000 (20 13:49 +0200)
committerStefan Kangas <skangas@skangas.se>
Wed, 20 Apr 2011 11:49:34 +0000 (20 13:49 +0200)
tree21273d514dd19d66858784c25dec8c0517118a6c
parenta92cc8376c32ac526fe9c27088ffc64a793c1ad4
parent9732dda9701f7d625699aa5348995619bba7f165
Merge branch 'master' of git://repo.or.cz/fripost-web