Merge pull request #15 from askoja/master
authorMarko Kreen <markokr@gmail.com>
Thu, 18 Oct 2012 12:19:03 +0000 (05:19 -0700)
committerMarko Kreen <markokr@gmail.com>
Thu, 18 Oct 2012 12:19:03 +0000 (05:19 -0700)
commit93ba3f78f9c19cd4c4431517f948e5808becd088
treee279b647b175d53e878c7b919727e8479140a70e
parent1e61ea5662160c7e27f2508dedf0271f8092bb89
parenta3dd719119849350445f2ef08c736ff9b25aa006
Merge pull request #15 from askoja/master

Two more merge related tests