2 Commits

Author	SHA1	Message	Date
Joshua Tauberer	0659a0bb16	Merge branch 'better_docker' of https://github.com/pjz/mailinabox into pjz-better_docker ... our trees had diverged, various conflicts resolved	2014-05-02 14:54:21 -04:00
Paul Jimenez	5ceec760b9	Better Dockerfile support	2014-05-02 13:03:37 -04:00