#
# ChangeLog for branches/mergetest/Makefile
#
# Generated by Trac 1.6
# 11/23/24 23:22:10

Thu, 29 Jul 2010 08:04:19 GMT Malte Marquarding [1775]
	* branches/mergetest (copied)

	Created branch to test alma merge back into trunk


Tue, 06 Jul 2010 11:04:24 GMT Kana Sugimoto [1761]
	* branches/alma/Makefile (modified)
	* branches/alma/apps/Makefile (added)

	New Development: Yes
	            JIRA Issue: No
	        Ready for ...