Commit Graph

2 Commits

Author SHA1 Message Date
Sebastian Lackner
10d9fda5f9 Merged with master. 2014-07-25 03:45:20 +02:00
Erich E. Hoover
6eb246a811 Work around bazaar merges not liking conflicts. 2013-11-23 17:00:04 -07:00