Merge branch 'TimePath/combined_updates' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
commite6eb6e7fc36a3a243c5171b8cc3db88e823514d4
tree32396b4060777807e72e930e24832e4eaa9a6e04
parentc6de5cf2639fc8c982b3ed82523b062ab65bacbd
parent4cb0e0cae0469097e9951d1967719bcaf340d793
Merge branch 'TimePath/combined_updates' into 'master'

TimePath/combined_updates

samual/combined_updates without the bad merge with nyov's effects changes

See merge request !50