From 17f000b744a49e56a6403b1f415d0e79f5a91f8f Mon Sep 17 00:00:00 2001
From: Paul Jimenez <pj@place.org>
Date: Thu, 1 May 2014 13:01:13 -0400
Subject: [PATCH] Upgrade from Precise to Trusty

Conflicts:
	image/sources.list
---
 image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index eb65ec3..369d0fa 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 MAINTAINER Phusion <info@phusion.nl>
 
 ENV HOME /root