Merge branch 'production'

author Oskar Wiksten <oskar.wiksten@gmail.com>

Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)

committer Oskar Wiksten <oskar.wiksten@gmail.com>

Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)
author Oskar Wiksten <oskar.wiksten@gmail.com>
Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)
committer Oskar Wiksten <oskar.wiksten@gmail.com>
Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
Simple merge
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
Simple merge
author	Oskar Wiksten <oskar.wiksten@gmail.com>
	Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)
committer	Oskar Wiksten <oskar.wiksten@gmail.com>
	Tue, 7 Aug 2012 12:15:07 +0000 (14:15 +0200)
		1	2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java	patch \|	diff1 \|	diff2 \|	blob \| history