]> git.openstreetmap.org Git - osqa.git/commit
resolving conflict in the email settings file
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Wed, 16 Mar 2011 00:27:31 +0000 (00:27 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Wed, 16 Mar 2011 00:27:31 +0000 (00:27 +0000)
commitfb252f100da6c6003a3db099e3ddc1a4a177fa1b
tree22ec5803c1b69a9225fa1788008f24f5b6011685
parent65779f741add23006d878bf17340ce230463ef6f
resolving conflict in the email settings file

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@852 0cfe37f9-358a-4d5e-be75-b63607b5c754