Merge branch 'master' of https://seekquarry.com/git/yioop into distributed-archive-crawl

Author Shawn Tice <sctice@gmail.com>
Author date 2012-05-08 06:May:th
Author local date 2012-05-07 23:May:th -0700
Committer Shawn Tice <sctice@gmail.com>
Committer date 2012-05-08 06:May:th
Committer local date 2012-05-07 23:May:th -0700
Commit 753ec363aea0224fd2bed4c040d9504f2bd375f3
Tree dffc03ecb452724df590417b1327c25bf3042a04
Parent ec7015bd4b17280d22f561020790ff7cdbe1e396
Parent 876e9b0380d96d975d55cbcf11fbfd1ad03a6278
Merge branch 'master' of https://seekquarry.com/git/yioop into distributed-archive-crawl

Conflicts:
	controllers/admin_controller.php
Affected files:
bin/fetcher.php
controllers/admin_controller.php
models/crawl_model.php
ViewGit