git.cweiske.de Git - phorkie.git/commit

author	Christian Weiske <cweiske@cweiske.de>
	Fri, 21 Sep 2012 08:32:47 +0000 (10:32 +0200)
committer	Christian Weiske <cweiske@cweiske.de>
	Fri, 21 Sep 2012 08:32:47 +0000 (10:32 +0200)
commit	9f4d00eb634cbf75db2143a62ce8733e901b14a8
tree	0c5c9f404893abf98a31c34fbd85eb73cbaed328	tree \| snapshot
parent	6249e4a7d43e130e23d6bb2a9190e395c5f01954	commit \| diff
parent	6c0d5be1b6ec69257b09b97ddfe0405eabe92459	commit \| diff

Merge branch 'milestone' of github.com:jnovack/phorkie into milestone

Conflicts:
README.rst

Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.