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)
Two more merge related tests


Trivial merge